diff options
| author | Pavel Vinogradov | 2019-09-06 16:01:21 -0400 |
|---|---|---|
| committer | Pavel Vinogradov | 2019-09-06 16:01:21 -0400 |
| commit | 0450bf4c99bcc607ce56593ba7535aa33e66e42b (patch) | |
| tree | 4c1f17f6153f84dd127d58b04756f54e09518af5 /gnome2-libs | |
| parent | acf4605a5819926fd07a5ebdf5597e04ad67a915 (diff) | |
gnome2-libs/glib2: fixed libiconv test in stable
Diffstat (limited to 'gnome2-libs')
| -rw-r--r-- | gnome2-libs/glib2/HISTORY | 3 | ||||
| -rwxr-xr-x | gnome2-libs/glib2/PRE_BUILD | 6 | ||||
| -rw-r--r-- | gnome2-libs/glib2/patches/libiconv.patch | 12 |
3 files changed, 21 insertions, 0 deletions
diff --git a/gnome2-libs/glib2/HISTORY b/gnome2-libs/glib2/HISTORY index 21c5461a3e..6a1eec67e2 100644 --- a/gnome2-libs/glib2/HISTORY +++ b/gnome2-libs/glib2/HISTORY @@ -1,3 +1,6 @@ +2019-09-06 Pavel Vinogradov <public@sourcemage.org> + * PRE_BUILD, patches/libiconv.patch: fixed libiconv test in stable + 2019-09-02 Pavel Vinogradov <public@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 0000000000..fb2a712a6c --- /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 0000000000..9f9bdd8d70 --- /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 |