Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (0450bf4c99bcc607ce56593ba7535aa33e66e42b)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Pavel Vinogradov <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (0450bf4c99bcc607ce56593ba7535aa33e66e42b)
  • Date: Fri, 6 Sep 2019 20:02:39 +0000

GIT changes to master grimoire by Pavel Vinogradov <public AT sourcemage.org>:

gnome2-libs/glib2/DEPENDS | 2 +-
gnome2-libs/glib2/HISTORY | 2 +-
gnome2-libs/glib2/PRE_BUILD | 6 ++++++
gnome2-libs/glib2/patches/libiconv.patch | 12 ++++++++++++
4 files changed, 20 insertions(+), 2 deletions(-)

New commits:
commit 0450bf4c99bcc607ce56593ba7535aa33e66e42b
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Pavel Vinogradov <public AT sourcemage.org>

gnome2-libs/glib2: fixed libiconv test in stable

commit acf4605a5819926fd07a5ebdf5597e04ad67a915
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Pavel Vinogradov <public AT sourcemage.org>

Revert "gnome2-libs/glib2: fixed libiconv flag in DEPENDS"

This reverts commit 1af07ce3e48e1caba988a8ee302cc6d41efd039a.

Wrong fix.

diff --git a/gnome2-libs/glib2/DEPENDS b/gnome2-libs/glib2/DEPENDS
index 0ecef5a..a2b326d 100755
--- a/gnome2-libs/glib2/DEPENDS
+++ b/gnome2-libs/glib2/DEPENDS
@@ -10,7 +10,7 @@ depends xz-utils &&
case "$HOST" in
*-gnu) ;;
*)
- depends libiconv 'iconv=external'
+ depends libiconv 'iconv=gnu'
;;
esac &&

diff --git a/gnome2-libs/glib2/HISTORY b/gnome2-libs/glib2/HISTORY
index 01326ba..6a1eec6 100644
--- a/gnome2-libs/glib2/HISTORY
+++ b/gnome2-libs/glib2/HISTORY
@@ -1,5 +1,5 @@
2019-09-06 Pavel Vinogradov <public AT sourcemage.org>
- * DEPENDS: fixed libiconv flag
+ * PRE_BUILD, patches/libiconv.patch: fixed libiconv test in stable

2019-09-02 Pavel Vinogradov <public AT sourcemage.org>
* DETAILS: versions 2.61.3/2.60.7
diff --git a/gnome2-libs/glib2/PRE_BUILD b/gnome2-libs/glib2/PRE_BUILD
new file mode 100755
index 0000000..fb2a712
--- /dev/null
+++ b/gnome2-libs/glib2/PRE_BUILD
@@ -0,0 +1,6 @@
+default_pre_build &&
+cd "${SOURCE_DIRECTORY}" &&
+
+if [[ "${GLIB_VER}" == "stable" ]]; then
+ apply_patch_dir patches
+fi
diff --git a/gnome2-libs/glib2/patches/libiconv.patch
b/gnome2-libs/glib2/patches/libiconv.patch
new file mode 100644
index 0000000..9f9bdd8
--- /dev/null
+++ b/gnome2-libs/glib2/patches/libiconv.patch
@@ -0,0 +1,12 @@
+diff --git a/meson.build b/meson.build
+--- a/meson.build
++++ b/meson.build
+@@ -1700,7 +1700,7 @@
+ found_iconv = true
+ endif
+ elif iconv_opt == 'gnu'
+- if cc.has_header_symbol('iconv.h', 'libiconv_open')
++ if cc.has_header_symbol('iconv.h', 'iconv_open')
+ glib_conf.set('USE_LIBICONV_GNU', true)
+ libiconv = [cc.find_library('iconv')]
+ found_iconv = true



  • [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (0450bf4c99bcc607ce56593ba7535aa33e66e42b), Pavel Vinogradov, 09/06/2019

Archive powered by MHonArc 2.6.24.

Top of Page