mate-panel: Fix build on -current.

Closed #42.

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackware-id.org>
This commit is contained in:
Willy Sudiarto Raharjo 2023-07-13 21:57:07 +07:00
parent abb48607c3
commit 8a91a496c1
No known key found for this signature in database
GPG key ID: 3F617144D7238786
2 changed files with 34 additions and 1 deletions

View file

@ -0,0 +1,31 @@
From 5a7f770082568453f3a5f271a274156f08352101 Mon Sep 17 00:00:00 2001
From: Brahmajit Das <brahmajit.xyz@gmail.com>
Date: Mon, 26 Jun 2023 21:37:46 +0530
Subject: [PATCH] libmate-panel-applet/Makefile.am: Fix build with gettext 0.22
With gettext-0.22 we are getting build errors like:
/usr/bin/msgfmt --desktop --keyword Name --keyword Description --template org.mate.panel.TestApplet.mate-panel-applet.desktop.in -d ../po -o org.mate.panel.TestApplet.mate-panel-applet
/usr/bin/msgfmt: no input file should be given if --desktop and -d are specified
Try '/usr/bin/msgfmt --help' for more information.
make[3]: *** [Makefile:1035: org.mate.panel.TestApplet.mate-panel-applet] Error 1
make[3]: *** Waiting for unfinished jobs....
Bug: https://bugs.gentoo.org/908877
Signed-off-by: Brahmajit Das <brahmajit.xyz@gmail.com>
---
libmate-panel-applet/Makefile.am | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/libmate-panel-applet/Makefile.am b/libmate-panel-applet/Makefile.am
index 196436e9a..dbb640b1e 100644
--- a/libmate-panel-applet/Makefile.am
+++ b/libmate-panel-applet/Makefile.am
@@ -95,7 +95,7 @@ appletdir = $(datadir)/mate-panel/applets
applet_in_files = org.mate.panel.TestApplet.mate-panel-applet.desktop.in
noinst_DATA = $(applet_in_files:.mate-panel-applet.desktop.in=.mate-panel-applet)
$(noinst_DATA): $(applet_in_files)
- $(AM_V_GEN) $(MSGFMT) --desktop --keyword Name --keyword Description --template $< -d $(top_srcdir)/po -o $@
+ $(AM_V_GEN) $(MSGFMT) --desktop --keyword=Name --keyword=Description --template $< -d $(top_srcdir)/po -o $@
EXTRA_DIST = \
org.mate.panel.TestApplet.mate-panel-applet.desktop.in \

View file

@ -25,7 +25,7 @@
PRGNAM=mate-panel PRGNAM=mate-panel
VERSION=${VERSION:-1.26.3} VERSION=${VERSION:-1.26.3}
BUILD=${BUILD:-1} BUILD=${BUILD:-2}
TAG=${TAG:-_msb} TAG=${TAG:-_msb}
if [ -z "$ARCH" ]; then if [ -z "$ARCH" ]; then
@ -78,6 +78,8 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
patch -p1 < $CWD/5a7f770082568453f3a5f271a274156f08352101.patch
CFLAGS="$SLKCFLAGS" \ CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \
./autogen.sh \ ./autogen.sh \