Skip to Content.
Sympa Menu

sm-commit - [[SM-Commit] ] GIT changes to master grimoire by Ismael Luceno (b6c14a9ef7dd57798b744a280c07b97bc5f2df41)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Ismael Luceno <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org, sm-commit AT lists.sourcemage.org
  • Subject: [[SM-Commit] ] GIT changes to master grimoire by Ismael Luceno (b6c14a9ef7dd57798b744a280c07b97bc5f2df41)
  • Date: Wed, 9 Apr 2025 00:36:28 +0000

GIT changes to master grimoire by Ismael Luceno <ismael AT sourcemage.org>:

x11-toolkits/gtk+/BUILD | 1
x11-toolkits/gtk+/DEPENDS | 1
x11-toolkits/gtk+/HISTORY | 6 +
x11-toolkits/gtk+/PRE_BUILD | 8 +-
x11-toolkits/gtk+/config.sub.patch | 12 ---
x11-toolkits/gtk+/patches/0001-po-Fix-non-standard-charsets.patch | 39
++++++++++
x11-toolkits/gtk+/patches/config.sub.patch | 12 +++
7 files changed, 66 insertions(+), 13 deletions(-)

New commits:
commit b6c14a9ef7dd57798b744a280c07b97bc5f2df41
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

gtk+: Fix build with gettext 0.24

commit 96348df7f22d6cb19f817623eb9bafed0609c74e
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

gtk+: Migrate to apply_patch_dir

commit e53c7ef447c87e91f777bdf2ea7c61738149b950
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

gtk+: Fix build against musl

diff --git a/x11-toolkits/gtk+/BUILD b/x11-toolkits/gtk+/BUILD
index cab88ab..907f46c 100755
--- a/x11-toolkits/gtk+/BUILD
+++ b/x11-toolkits/gtk+/BUILD
@@ -1,2 +1,3 @@
+OPTS+=" --host=$HOST" &&
CFLAGS+=" -std=gnu89" &&
default_build
diff --git a/x11-toolkits/gtk+/DEPENDS b/x11-toolkits/gtk+/DEPENDS
index 5dd35d0..dd88398 100755
--- a/x11-toolkits/gtk+/DEPENDS
+++ b/x11-toolkits/gtk+/DEPENDS
@@ -1,4 +1,5 @@
depends glib &&
+depends libiconv &&
depends libx11 &&
depends libxext &&

diff --git a/x11-toolkits/gtk+/HISTORY b/x11-toolkits/gtk+/HISTORY
index c181302..b04c735 100644
--- a/x11-toolkits/gtk+/HISTORY
+++ b/x11-toolkits/gtk+/HISTORY
@@ -1,3 +1,9 @@
+2025-04-09 Ismael Luceno <ismael AT sourcemage.org>
+ * PRE_BUILD: Fixed build against musl
+ * PRE_BUILD, patches/config.sub.patch: migrated to apply_patch_dir
+ * PRE_BUILD, patches/0001-po-Fix-non-standard-charsets.patch:
+ fixed build with gettext 0.24
+
2019-05-18 Ismael Luceno <ismael AT sourcemage.org>
* DEPENDS: Update dependency; s/gettext/GETTEXT/

diff --git a/x11-toolkits/gtk+/PRE_BUILD b/x11-toolkits/gtk+/PRE_BUILD
index 2039c61..36c1547 100755
--- a/x11-toolkits/gtk+/PRE_BUILD
+++ b/x11-toolkits/gtk+/PRE_BUILD
@@ -1,4 +1,10 @@
default_pre_build &&
cd "$SOURCE_DIRECTORY" &&
+apply_patch_dir patches &&

-patch -p0 < "$SPELL_DIRECTORY/config.sub.patch"
+# Convert files with non-standard charsets to UTF-8
+f=$(mktemp) &&
+>"$f" iconv -f TCVN5712-1 -t UTF-8 po/vi.po &&
+mv "$f" po/vi.po &&
+
+sedit 's!maybe_os in$!& linux-musl*|\\!' config.sub
diff --git a/x11-toolkits/gtk+/config.sub.patch
b/x11-toolkits/gtk+/config.sub.patch
deleted file mode 100644
index c3569a1..0000000
--- a/x11-toolkits/gtk+/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/x11-toolkits/gtk+/patches/0001-po-Fix-non-standard-charsets.patch
b/x11-toolkits/gtk+/patches/0001-po-Fix-non-standard-charsets.patch
new file mode 100644
index 0000000..3e00956
--- /dev/null
+++ b/x11-toolkits/gtk+/patches/0001-po-Fix-non-standard-charsets.patch
@@ -0,0 +1,39 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Ismael Luceno <ismael AT sourcemage.org>
+Date: Tue, 8 Apr 2025 04:58:18 +0200
+Subject: [PATCH] po: Fix non-standard charsets
+
+Upstream-Status: Inappropriate [legacy]
+Origin: Source Mage
+Signed-off-by: Ismael Luceno <ismael AT sourcemage.org>
+---
+ po/az.po | 2 +-
+ po/vi.po | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/po/az.po b/po/az.po
+index f66f22917135..0baf063c37d1 100644
+--- a/po/az.po
++++ b/po/az.po
+@@ -10,7 +10,7 @@ msgstr ""
+ "Last-Translator: Vasif Ismailoglu MD <azerb_linux AT hotmail.com>\n"
+ "Language-Team: Azerbaijani turkish \n"
+ "MIME-Version: 1.0\n"
+-"Content-Type: text/plain; charset=iso-8859-9e\n"
++"Content-Type: text/plain; charset=iso-8859-9\n"
+ "Content-Transfer-Encoding: 8bit\n"
+
+ #: gtk/gtkcolorsel.c:221
+diff --git a/po/vi.po b/po/vi.po
+index 1cbb4e89edaf..51fb3a903a32 100644
+--- a/po/vi.po
++++ b/po/vi.po
+@@ -11,7 +11,7 @@ msgstr ""
+ "Last-Translator: Hoang Ngoc Tu <hntu AT gmx.de>\n"
+ "Language-Team: Vietnamese <vi AT li.org>\n"
+ "MIME-Version: 1.0\n"
+-"Content-Type: text/plain; charset=TCVN-5712\n"
++"Content-Type: text/plain; charset=UTF-8\n"
+ "Content-Transfer-Encoding: 8bit\n"
+
+ #: gtk/gtkcolorsel.c:221
diff --git a/x11-toolkits/gtk+/patches/config.sub.patch
b/x11-toolkits/gtk+/patches/config.sub.patch
new file mode 100644
index 0000000..6094495
--- /dev/null
+++ b/x11-toolkits/gtk+/patches/config.sub.patch
@@ -0,0 +1,12 @@
+--- a/config.sub
++++ b/config.sub
+@@ -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
+ ;;


  • [[SM-Commit] ] GIT changes to master grimoire by Ismael Luceno (b6c14a9ef7dd57798b744a280c07b97bc5f2df41), Ismael Luceno, 04/08/2025

Archive powered by MHonArc 2.6.24.

Top of Page