Skip to content

glib build fix with libiconv #6043

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
th0ma7 merged 2 commits into from
Mar 23, 2024
Merged

glib build fix with libiconv #6043

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4d547cf
glib-2.66: Fix for libiconv when built prior to glib
th0ma7 Mar 21, 2024
ba5dbe0
glib-latest: Update from version 2.74.5 to 2.78.4
th0ma7 Mar 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion cross/glib-2.66/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ PKG_DIR = $(PKG_NAME)-$(PKG_VERS)
PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
PKG_DIST_SITE = https://download.gnome.org/sources/glib/$(word 1,$(subst ., ,$(PKG_VERS))).$(word 2,$(subst ., ,$(PKG_VERS)))

DEPENDS = cross/libffi cross/pcre2 cross/zlib
DEPENDS = cross/libffi cross/libiconv cross/pcre2 cross/zlib

HOMEPAGE = https://developer.gnome.org/glib/
COMMENT = General-purpose utility library.
Expand All @@ -18,5 +18,6 @@ CONFIGURE_ARGS += -Dgtk_doc=false -Dman=false
CONFIGURE_ARGS += -Dlibmount=disabled
CONFIGURE_ARGS += -Ddefault_library=shared
CONFIGURE_ARGS += -Dselinux=disabled
CONFIGURE_ARGS += -Diconv=external

include ../../mk/spksrc.cross-meson.mk
4 changes: 2 additions & 2 deletions cross/glib-latest/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
PKG_NAME = glib
PKG_VERS = 2.74.5
PKG_VERS = 2.78.4
PKG_EXT = tar.xz
PKG_DIR = $(PKG_NAME)-$(PKG_VERS)
PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
PKG_DIST_SITE = https://download.gnome.org/sources/glib/$(word 1,$(subst ., ,$(PKG_VERS))).$(word 2,$(subst ., ,$(PKG_VERS)))

DEPENDS = cross/libffi cross/pcre2 cross/zlib
DEPENDS = cross/libffi cross/libiconv cross/pcre2 cross/zlib

HOMEPAGE = https://developer.gnome.org/glib/
COMMENT = General-purpose utility library.
Expand Down
10 changes: 5 additions & 5 deletions cross/glib-latest/PLIST
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
lnk:lib/libgio-2.0.so
lnk:lib/libgio-2.0.so.0
lib:lib/libgio-2.0.so.0.7400.5
lib:lib/libgio-2.0.so.0.7800.4
lnk:lib/libglib-2.0.so
lnk:lib/libglib-2.0.so.0
lib:lib/libglib-2.0.so.0.7400.5
lib:lib/libglib-2.0.so.0.7800.4
lnk:lib/libgmodule-2.0.so
lnk:lib/libgmodule-2.0.so.0
lib:lib/libgmodule-2.0.so.0.7400.5
lib:lib/libgmodule-2.0.so.0.7800.4
lnk:lib/libgobject-2.0.so
lnk:lib/libgobject-2.0.so.0
lib:lib/libgobject-2.0.so.0.7400.5
lib:lib/libgobject-2.0.so.0.7800.4
lnk:lib/libgthread-2.0.so
lnk:lib/libgthread-2.0.so.0
lib:lib/libgthread-2.0.so.0.7400.5
lib:lib/libgthread-2.0.so.0.7800.4
6 changes: 3 additions & 3 deletions cross/glib-latest/digests
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
glib-2.74.5.tar.xz SHA1 0c0802e27b0835bc911a47952e885a5555f1873a
glib-2.74.5.tar.xz SHA256 ceba83a5999ceb31a4c4fc9921207cb9ffffd2ab1d6ec03c162d3f608a5c14c8
glib-2.74.5.tar.xz MD5 7561501d9f63f3418ddb23d2903cc968
glib-2.78.4.tar.xz SHA1 1436c17553d8eb9f2839311569724a6d654acbdd
glib-2.78.4.tar.xz SHA256 24b8e0672dca120cc32d394bccb85844e732e04fe75d18bb0573b2dbc7548f63
glib-2.78.4.tar.xz MD5 0781e889cab64f1f7dbb6e8357c6a95f