New commits:
commit 4619eea633068657ec05b62dc298380401a86053
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>
containers 1.6
commit e250b47356d66e00ec04a3bb86e558d2bf6491f7
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>
rest 0.8.1
commit 924b82780179fd9f8aa63320a0b4951026ed1e87
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>
libsoup: Add missing dependency on krb5
commit bad163be50f53962ca7c82209cd5ff2cee82c4e2
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>
libgnome-keyring 3.12.0
commit 1802a7dad0b961b2de5d3ec0eb6fc1aec3de46a1
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>
clone 0.43
commit a2f8495dd9fed16dfe11ddcc92534d8bba8a5c62
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>
gts: Fix build against musl
commit 0f5b015d126d94ac11c6c011e17f16020dbcbf5e
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>
recode: Fix build against musl
On musl-libc we must depend on libiconv.
When building inside Sorcery, the configure script fills LIBS
incorrectly, with full paths instead of -l flags, and libtool doesn't
seem to handle those correctly.
commit 0e4c21e55f98df1c5ef68b0f295209f7651738bc
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>
recode 3.7.1
diff --git a/devel/recode/DEPENDS b/devel/recode/DEPENDS
new file mode 100755
index 0000000..7550a08
--- /dev/null
+++ b/devel/recode/DEPENDS
@@ -0,0 +1,5 @@
+case "$HOST" in
+*-musl)
+ depends libiconv
+ ;;
+esac
diff --git a/devel/recode/DETAILS b/devel/recode/DETAILS
index 9cf3caa..14d6a89 100755
--- a/devel/recode/DETAILS
+++ b/devel/recode/DETAILS
@@ -1,13 +1,12 @@
SPELL=recode
- VERSION=3.6
+ VERSION=3.7.1
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
- SOURCE_URL[0]=$GNU_URL/$SPELL/$SOURCE
-
SOURCE_HASH=sha512:68de277ac8cd5f6023bb077b959ab5778a78edac1299d507bab906824080b6f86e9bfcd89169aa474197c2faa9af2ceb1ed272c8dd4d50caef373afa05daed1b
+ WEB_SITE=https://github.com/rrthomas/recode
+ SOURCE_URL[0]="$WEB_SITE/releases/download/v$VERSION/$SOURCE"
+
SOURCE_HASH=sha512:3cb067fb7e1b0ec89c47e7177cb172bc8253042780101f6d8cb1de7bc0873d2af217e7b04a33ac23bdb8ffd41e43eac767307c4bd8a94355c188d5013f177b04
LICENSE[0]=GPL
- WEB_SITE=http://www.gnu.org/directory/recode.html
ENTERED=20020208
- UPDATED=20050323
KEYWORDS="devel"
SHORT="recode can convert almost any character set to almost any
other."
cat << EOF
diff --git a/devel/recode/HISTORY b/devel/recode/HISTORY
index 734943c..ecdbefc 100644
--- a/devel/recode/HISTORY
+++ b/devel/recode/HISTORY
@@ -1,3 +1,8 @@
+2019-08-16 Ismael Luceno <ismael AT sourcemage.org>
+ * config.sub.patch, gcc43.patch, PRE_BUILD: removed, no longer needed
+ * DETAILS: updated spell to 3.7.1
+ * DEPENDS, PRE_BUILD: Fixed build against musl
+
2008-11-21 George Sherwood <gsherwood AT sourcemage.org>
* BUILD: Removed file. Patch was removed, but reference was not.
Bug 14902.
diff --git a/devel/recode/PRE_BUILD b/devel/recode/PRE_BUILD
index 315c601..761dc16 100755
--- a/devel/recode/PRE_BUILD
+++ b/devel/recode/PRE_BUILD
@@ -1,4 +1,6 @@
-default_pre_build &&
-cd $SOURCE_DIRECTORY &&
-patch -p0 < $SPELL_DIRECTORY/config.sub.patch &&
-patch -p0 < $SPELL_DIRECTORY/gcc43.patch
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+
+# XXX Workaround for configure misdetecting the libraries (full path to DSOs
+# instead of -l flags) which libtool doesn't seem to handle correctly.
+case "$HOST" in *-musl) sedit 's!@LIBS@!-liconv!' src/Makefile.in;; esac
diff --git a/devel/recode/config.sub.patch b/devel/recode/config.sub.patch
deleted file mode 100644
index c3569a1..0000000
--- a/devel/recode/config.sub.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- config.sub.old 2000-02-02 16:53:22.000000000 -0800
-+++ config.sub 2005-04-04 23:12:05.000000000 -0700
-@@ -632,6 +631,9 @@
- pentiumii-* | pentium2-*)
- basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
- ;;
-+ x86_64-*)
-+ basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'`
-+ ;;
- pn)
- basic_machine=pn-gould
- ;;
diff --git a/devel/recode/gcc43.patch b/devel/recode/gcc43.patch
deleted file mode 100644
index 18927ff..0000000
--- a/devel/recode/gcc43.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- src/recodext.h 2008-04-03 18:35:42 +0000
-+++ src/recodext.h 2008-04-03 18:36:32 +0000
-@@ -215,10 +215,10 @@
- struct recode_single *unsurfacer;
-
- /* Non zero if this is an acceptable charset (not only a surface). */
-- enum recode_symbol_type type : 3;
-+ enum recode_symbol_type type : 2;
-
- /* Non zero if this one should be ignored. */
-- bool ignore : 2;
-+ bool ignore : 1;
- };
-
- struct recode_surface_list
-
-
diff --git a/gnome2-libs/libgnome-keyring/DEPENDS
b/gnome2-libs/libgnome-keyring/DEPENDS
index f865fd7..f498b26 100755
--- a/gnome2-libs/libgnome-keyring/DEPENDS
+++ b/gnome2-libs/libgnome-keyring/DEPENDS
@@ -1,10 +1,14 @@
depends glib2 &&
depends dbus &&
depends libgcrypt &&
-depends eggdbus &&
depends intltool &&
depends libgpg-error &&