From 54aaa779115fc0434ac81cbbf6bd3c7314cd6060 Mon Sep 17 00:00:00 2001 From: Fredrik Rinnestam Date: Thu, 16 Feb 2017 21:32:17 +0100 Subject: [PATCH 1/4] dbus: updated to 1.10.16 --- dbus/.footprint | 6 +++--- dbus/.md5sum | 2 +- dbus/Pkgfile | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dbus/.footprint b/dbus/.footprint index 61ab7c1b1..6b4d2c13d 100644 --- a/dbus/.footprint +++ b/dbus/.footprint @@ -48,9 +48,9 @@ drwxr-xr-x root/root usr/lib/dbus/ -rwsr-x--- root/messagebus usr/lib/dbus/dbus-daemon-launch-helper -rw-r--r-- root/root usr/lib/libdbus-1.a -rwxr-xr-x root/root usr/lib/libdbus-1.la -lrwxrwxrwx root/root usr/lib/libdbus-1.so -> libdbus-1.so.3.14.9 -lrwxrwxrwx root/root usr/lib/libdbus-1.so.3 -> libdbus-1.so.3.14.9 --rwxr-xr-x root/root usr/lib/libdbus-1.so.3.14.9 +lrwxrwxrwx root/root usr/lib/libdbus-1.so -> libdbus-1.so.3.14.10 +lrwxrwxrwx root/root usr/lib/libdbus-1.so.3 -> libdbus-1.so.3.14.10 +-rwxr-xr-x root/root usr/lib/libdbus-1.so.3.14.10 drwxr-xr-x root/root usr/lib/pkgconfig/ -rw-r--r-- root/root usr/lib/pkgconfig/dbus-1.pc drwxr-xr-x root/root usr/sbin/ diff --git a/dbus/.md5sum b/dbus/.md5sum index 75e7be33d..7e6d82b0d 100644 --- a/dbus/.md5sum +++ b/dbus/.md5sum @@ -1,3 +1,3 @@ 23bc5ff22fe4f9a208d65fbbfd489ad9 30-dbus.launch -3f7b013ce8f641cd4c897acda0ef3467 dbus-1.10.14.tar.gz +7f06c43736874c1ff50ae20392955511 dbus-1.10.16.tar.gz 0acb71de3d0fc3271d2391da168c6f9f rc.dbus diff --git a/dbus/Pkgfile b/dbus/Pkgfile index 6a3216078..93a995b3b 100644 --- a/dbus/Pkgfile +++ b/dbus/Pkgfile @@ -4,7 +4,7 @@ # Depends on: expat name=dbus -version=1.10.14 +version=1.10.16 release=1 source=(http://dbus.freedesktop.org/releases/dbus/$name-$version.tar.gz \ rc.dbus 30-dbus.launch) From a2c26aacc0290da5ef0d7fd48b87a13f647ba1df Mon Sep 17 00:00:00 2001 From: Danny Rawlins Date: Sat, 18 Feb 2017 15:00:43 +1100 Subject: [PATCH 2/4] pyparsing: move PYTHONVERSION outside of if block --- pyparsing/Pkgfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pyparsing/Pkgfile b/pyparsing/Pkgfile index c96d2cd6d..bcc34284a 100644 --- a/pyparsing/Pkgfile +++ b/pyparsing/Pkgfile @@ -5,19 +5,19 @@ name=pyparsing version=2.1.10 -release=2 +release=3 source=(https://files.pythonhosted.org/packages/source/${name:0:1}/$name/$name-$version.tar.gz https://bootstrap.pypa.io/get-pip.py) build() { cd $name-$version + local PYTHONVERSION=$(/usr/bin/python -c 'import sys; print("%s.%s" % sys.version_info[:2])') + if [ "$(pkginfo -i | egrep -c '^(setuptools|appdirs|pyparsing|six|pip|packaging) ')" != 6 ]; then install -d build /usr/bin/python $SRC/get-pip.py --root=$SRC/build - local PYTHONVERSION=$(/usr/bin/python -c 'import sys; print("%s.%s" % sys.version_info[:2])') - PYTHONPATH=$SRC/build/usr/lib/python$PYTHONVERSION/site-packages \ /usr/bin/python setup.py build From 14d2acafab7e4a5dd537520b8a1f3414ba7a578c Mon Sep 17 00:00:00 2001 From: Danny Rawlins Date: Sat, 18 Feb 2017 15:01:22 +1100 Subject: [PATCH 3/4] python3-pyparsing: move PYTHONVERSION outside of if block --- python3-pyparsing/Pkgfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/python3-pyparsing/Pkgfile b/python3-pyparsing/Pkgfile index c1fff76d5..8ffd381d5 100644 --- a/python3-pyparsing/Pkgfile +++ b/python3-pyparsing/Pkgfile @@ -5,19 +5,19 @@ name=python3-pyparsing version=2.1.10 -release=2 +release=3 source=(https://files.pythonhosted.org/packages/source/${name:8:1}/${name#*-}/${name#*-}-$version.tar.gz https://bootstrap.pypa.io/get-pip.py) build() { cd ${name#*-}-$version + local PYTHONVERSION=$(/usr/bin/python3 -c 'import sys; print("%s.%s" % sys.version_info[:2])') + if [ "$(pkginfo -i | egrep -c '^python3-(setuptools|appdirs|pyparsing|six|pip|packaging) ')" != 6 ]; then install -d build /usr/bin/python3 $SRC/get-pip.py --root=$SRC/build - local PYTHONVERSION=$(/usr/bin/python3 -c 'import sys; print("%s.%s" % sys.version_info[:2])') - PYTHONPATH=$SRC/build/usr/lib/python$PYTHONVERSION/site-packages \ /usr/bin/python3 setup.py build From 12bebd74959180a86c98c19f16c3128db7616d05 Mon Sep 17 00:00:00 2001 From: Danny Rawlins Date: Sat, 18 Feb 2017 15:03:01 +1100 Subject: [PATCH 4/4] qt5: remove disable cups, now becomes a soft dependency --- qt5/Pkgfile | 1 - 1 file changed, 1 deletion(-) diff --git a/qt5/Pkgfile b/qt5/Pkgfile index 29afc3f23..8ea5b89c2 100644 --- a/qt5/Pkgfile +++ b/qt5/Pkgfile @@ -52,7 +52,6 @@ build() { -sysconfdir /usr/etc/xdg \ -confirm-license \ -dbus-linked \ - -no-cups \ -no-egl \ -nomake examples \ -no-pch \