summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBritney Fransen <brfransen@gmail.com>2016-01-20 18:59:32 (GMT)
committerBritney Fransen <brfransen@gmail.com>2016-01-20 18:59:32 (GMT)
commitbf047c18afc77ca054e90dc8069e04bd4eb8c6fa (patch)
tree7951018f595904130d345b6a4560e79b65caaffc
parentbd05c5aff916dac7186c3089e19a607713871e41 (diff)
parent47d048aecaaaa3b9aa78b3ba4cb6a9dd177f0d98 (diff)
downloadlinhes_pkgbuild-bf047c18afc77ca054e90dc8069e04bd4eb8c6fa.zip
linhes_pkgbuild-bf047c18afc77ca054e90dc8069e04bd4eb8c6fa.tar.gz
linhes_pkgbuild-bf047c18afc77ca054e90dc8069e04bd4eb8c6fa.tar.bz2
Merge branch 'testing' of linhes.org:linhes_pkgbuild into testing
-rw-r--r--abs/core/gnupg/PKGBUILD2
-rw-r--r--abs/core/pacman/PKGBUILD2
-rw-r--r--abs/core/qt5/PKGBUILD4
-rw-r--r--abs/core/qt5/__changelog1
4 files changed, 5 insertions, 4 deletions
diff --git a/abs/core/gnupg/PKGBUILD b/abs/core/gnupg/PKGBUILD
index 9ac8772..6d7dc98 100644
--- a/abs/core/gnupg/PKGBUILD
+++ b/abs/core/gnupg/PKGBUILD
@@ -6,7 +6,7 @@
pkgname=gnupg
pkgver=2.0.22
-pkgrel=1
+pkgrel=2
pkgdesc='Complete and free implementation of the OpenPGP standard'
url='http://www.gnupg.org/'
license=('GPL')
diff --git a/abs/core/pacman/PKGBUILD b/abs/core/pacman/PKGBUILD
index e592ff5..77838cf 100644
--- a/abs/core/pacman/PKGBUILD
+++ b/abs/core/pacman/PKGBUILD
@@ -5,7 +5,7 @@
pkgname=pacman
pkgver=4.2.1
-pkgrel=3
+pkgrel=4
pkgdesc="A library-based package manager with dependency support"
arch=('i686' 'x86_64')
url="http://www.archlinux.org/pacman/"
diff --git a/abs/core/qt5/PKGBUILD b/abs/core/qt5/PKGBUILD
index d16e001..5b87698 100644
--- a/abs/core/qt5/PKGBUILD
+++ b/abs/core/qt5/PKGBUILD
@@ -37,7 +37,7 @@ license=('GPL3' 'LGPL' 'FDL' 'custom')
makedepends=('libxcb' 'xcb-proto' 'xcb-util' 'xcb-util-image' 'xcb-util-wm' 'xcb-util-keysyms'
'mesa' 'at-spi2-core' 'alsa-lib' 'gst-plugins-base-libs' 'libjpeg-turbo' 'cups'
'hicolor-icon-theme' 'desktop-file-utils' 'postgresql-libs' 'nss'
- 'libmariadbclient' 'sqlite' 'unixodbc' 'libfbclient' 'libmng' 'python2' 'ruby'
+ 'libmysqlclient' 'sqlite' 'unixodbc' 'libfbclient' 'libmng' 'python2' 'ruby'
'gperf' 'libxslt' 'libxcomposite' 'fontconfig' 'bluez-libs' 'openal' 'gtk2'
'libxkbcommon-x11' 'mtdev' 'harfbuzz' 'libwebp' 'leveldb' 'geoclue' 'pciutils'
'libinput' 'yasm' 'git')
@@ -146,7 +146,7 @@ package_qt5-base() {
'qtchooser' 'libinput' 'libsm' 'libxkbcommon-x11')
optdepends=('qt5-svg: to use SVG icon themes'
'postgresql-libs: PostgreSQL driver'
- 'libmariadbclient: MariaDB driver'
+ 'libmysqlclient: MariaDB driver'
'unixodbc: ODBC driver'
'libfbclient: Firebird/iBase driver'
'mtdev: evdev plugin'
diff --git a/abs/core/qt5/__changelog b/abs/core/qt5/__changelog
index 5bdff6c..9c208ab 100644
--- a/abs/core/qt5/__changelog
+++ b/abs/core/qt5/__changelog
@@ -1,3 +1,4 @@
PKGBUILD:
- remove dep libpulse
- remove dep libfbclient
+- changed libmaria to libmysql