sm-commit AT lists.ibiblio.org
Subject: Source Mage code commit list
List archive
[SM-Commit] GIT changes to master grimoire by Treeve Jelbert (e2381445f9a61746edbe37b00030438a0176fe53)
- From: Treeve Jelbert <scm AT sourcemage.org>
- To: sm-commit AT lists.ibiblio.org
- Subject: [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (e2381445f9a61746edbe37b00030438a0176fe53)
- Date: Sun, 23 Aug 2020 13:02:40 +0000
GIT changes to master grimoire by Treeve Jelbert <treeve AT sourcemage.org>:
devel/pkgconfig/BUILD | 2 -
devel/pkgconfig/HISTORY | 3 ++
python-pypi/bup/BUILD | 1
python-pypi/bup/DEPENDS | 6 ++--
python-pypi/bup/DETAILS | 5 ++--
python-pypi/bup/HISTORY | 9 +++++++
python-pypi/bup/PRE_BUILD | 3 ++
python-pypi/bup/patches/config.patch | 43
+++++++++++++++++++++++++++++++++++
xorg-lib/libinput/DETAILS | 2 -
xorg-lib/libinput/HISTORY | 3 ++
10 files changed, 70 insertions(+), 7 deletions(-)
New commits:
commit e2381445f9a61746edbe37b00030438a0176fe53
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
bup - fix finding readline.h
commit cfe18644c6b7d77e4675233efd922e5f83d40053
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
pkgconfig - tweak search path
commit 7ab84553afe19da6f76fff0b32cb7aa591cbbd51
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
bup: => 0.31
commit ebf30f79b92dee76066b9ae16b163ad2e680a4a8
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
libinput: => 1.16.1
diff --git a/devel/pkgconfig/BUILD b/devel/pkgconfig/BUILD
index 2831915..604e69a 100755
--- a/devel/pkgconfig/BUILD
+++ b/devel/pkgconfig/BUILD
@@ -2,5 +2,5 @@
# subsequently be built when pkg-config is also broken due to linking to
# system glib2.
OPTS="$OPTS --with-internal-glib" &&
-OPTS="$OPTS
--with-pc-path=/usr/lib/pkgconfig:/usr/share/pkgconfig:/opt/qt4/lib/pkgconfig"
&&
+OPTS="$OPTS
--with-pc-path=/usr/lib/pkgconfig:/usr/share/pkgconfig:/lib/pkgconfig" &&
default_build
diff --git a/devel/pkgconfig/HISTORY b/devel/pkgconfig/HISTORY
index ecc662f..00014d6 100644
--- a/devel/pkgconfig/HISTORY
+++ b/devel/pkgconfig/HISTORY
@@ -1,3 +1,6 @@
+2020-08-23 Treeve Jelbert <treeve AT sourcemage.org>
+ * BUILD: ensure to search /lib/pkgconfig
+
2017-03-20 Pavel Vinogradov <public AT sourcemage.org>
* DETAILS: version 0.29.2
* PRE_BUILD, pkg-config_gcc6.patch: removed, fixed by upstream
diff --git a/python-pypi/bup/BUILD b/python-pypi/bup/BUILD
index 457ed76..2060470 100755
--- a/python-pypi/bup/BUILD
+++ b/python-pypi/bup/BUILD
@@ -1,3 +1,4 @@
+export PYTHON=python3 &&
cd $SOURCE_DIRECTORY &&
./configure &&
make PREFIX=$INSTALL_ROOT/usr
diff --git a/python-pypi/bup/DEPENDS b/python-pypi/bup/DEPENDS
index 4367db6..72f713c 100755
--- a/python-pypi/bup/DEPENDS
+++ b/python-pypi/bup/DEPENDS
@@ -1,6 +1,6 @@
-depends python &&
+depends python3 &&
depends fuse-python &&
depends git &&
-depends pylibacl &&
-depends pyxattr &&
+depends acl &&
+depends readline &&
optional_depends par2cmdline-tbb '' '' 'recover corrupted backups'
diff --git a/python-pypi/bup/DETAILS b/python-pypi/bup/DETAILS
index d40a58e..4acb91a 100755
--- a/python-pypi/bup/DETAILS
+++ b/python-pypi/bup/DETAILS
@@ -1,6 +1,7 @@
SPELL=bup
- VERSION=0.30.1
-
SOURCE_HASH=sha512:467bdcb55a340b3c9c591c0aef6abd7d687879d5f608dce4fc26085ff3f41af204cc2720bc99fdfe61ebb846d61dea63713b69c68e41361e92d5709ede6f12d7
+ VERSION=0.31
+
SOURCE_HASH=sha512:9ff38bc945c6617610777bf2c484362503586a9bb486a64924d7f821548e2669905ab173486190706e90eebe5a0ae1c1393901a16499581b229cfde041ebdcee
+ PATCHLEVEL=1
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
WEB_SITE=https://github.com/bup/bup
diff --git a/python-pypi/bup/HISTORY b/python-pypi/bup/HISTORY
index c347792..4d2e7e0 100644
--- a/python-pypi/bup/HISTORY
+++ b/python-pypi/bup/HISTORY
@@ -1,3 +1,12 @@
+2020-08-23 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: PATCHLEVEL=1
+ * patches/config.patch PRE_BUILD: added, fix finding readline.h
+
+2020-08-22 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.31
+ * DEPENDS: +readline, +acl, -pyacl, python3
+ * BUILD: force python3
+
2020-05-24 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 0.30.1
diff --git a/python-pypi/bup/PRE_BUILD b/python-pypi/bup/PRE_BUILD
new file mode 100755
index 0000000..922c0ab
--- /dev/null
+++ b/python-pypi/bup/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+apply_patch_dir patches
diff --git a/python-pypi/bup/patches/config.patch
b/python-pypi/bup/patches/config.patch
new file mode 100644
index 0000000..2214772
--- /dev/null
+++ b/python-pypi/bup/patches/config.patch
@@ -0,0 +1,43 @@
+commit 8ef983574c4ce929879db3c759933a7ec23d63ab
+Author: Treeve Jelbert <treeve AT sourcemage.org>
+Date: Sun Aug 23 14:11:58 2020 +0200
+
+ include stdio.h before readline.h
+
+diff --git a/config/configure b/config/configure
+index bbf5fb3..34ee442 100755
+--- a/config/configure
++++ b/config/configure
+@@ -192,12 +192,14 @@ if pkg-config readline; then
+ # It looks like it's not uncommon for pkg-config to provide a -I
+ # that doesn't support the documentation's specified #include
+ # <readline/readline.h>. See what's really going on.
+- if bup_try_c_code "#include <readline/readline.h> $readline_test_code" \
++ if bup_try_c_code "#include <stdio.h>
++ #include <readline/readline.h> $readline_test_code" \
+ "$bup_readline_cflags"
+ then
+ bup_have_readline=1
+ bup_readline_includes_in_subdir=1
+- elif bup_try_c_code "#include <readline.h> $readline_test_code" \
++ elif bup_try_c_code "#include <stdio.h>
++ #include <readline.h> $readline_test_code" \
+ "$bup_readline_cflags"
+ then
+ bup_have_readline=1
+@@ -210,11 +212,13 @@ if pkg-config readline; then
+ fi
+ fi
+ if ! test "$bup_have_readline"; then
+- if bup_try_c_code "#include <readline/readline.h> $readline_test_code";
then
++ if bup_try_c_code "#include <stdio.h>
++ #include <readline/readline.h> $readline_test_code";
then
+ bup_readline_ldflags=-lreadline
+ bup_have_readline=1
+ bup_readline_includes_in_subdir=1
+- elif bup_try_c_code "#include <readline.h> $readline_test_code"; then
++ elif bup_try_c_code "#include <stdio.h>
++ #include <readline.h> $readline_test_code"; then
+ bup_readline_ldflags=-lreadline
+ bup_have_readline=1
+ fi
diff --git a/xorg-lib/libinput/DETAILS b/xorg-lib/libinput/DETAILS
index c56b78a..74b4365 100755
--- a/xorg-lib/libinput/DETAILS
+++ b/xorg-lib/libinput/DETAILS
@@ -1,6 +1,6 @@
source $GRIMOIRE/MESON_FUNCTIONS
SPELL=libinput
- VERSION=1.16.0
+ VERSION=1.16.1
SOURCE=$SPELL-$VERSION.tar.xz
SOURCE_URL=https://www.freedesktop.org/software/$SPELL/$SOURCE
SOURCE2=$SOURCE.sig
diff --git a/xorg-lib/libinput/HISTORY b/xorg-lib/libinput/HISTORY
index 27f7f56..ddf2c00 100644
--- a/xorg-lib/libinput/HISTORY
+++ b/xorg-lib/libinput/HISTORY
@@ -1,3 +1,6 @@
+2020-08-22 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.16.1
+
2020-08-03 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.16.0
- [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (e2381445f9a61746edbe37b00030438a0176fe53), Treeve Jelbert, 08/23/2020
Archive powered by MHonArc 2.6.24.