mirror of
https://gitlab.com/mateslackbuilds/msb.git
synced 2024-12-25 21:59:36 +01:00
libgksu: Added patch to fix gksu-run-helper issue
Signed-off-by: Willy Sudiarto Raharjo <willysr@slackware-id.org>
This commit is contained in:
parent
4f90319b54
commit
9e67a0d20b
4 changed files with 165 additions and 1 deletions
60
deps/libgksu/libgksu-2.0.0-fbsd.patch
vendored
Normal file
60
deps/libgksu/libgksu-2.0.0-fbsd.patch
vendored
Normal file
|
@ -0,0 +1,60 @@
|
|||
diff --exclude-from=/home/dang/.diffrc -up -ruN libgksu-2.0.0.orig/libgksu/libgksu.c libgksu-2.0.0/libgksu/libgksu.c
|
||||
--- libgksu-2.0.0.orig/libgksu/libgksu.c 2006-09-14 22:35:51.000000000 -0400
|
||||
+++ libgksu-2.0.0/libgksu/libgksu.c 2006-12-12 11:28:01.000000000 -0500
|
||||
@@ -23,7 +23,12 @@
|
||||
#include <unistd.h>
|
||||
#include <string.h>
|
||||
#include <fcntl.h>
|
||||
+#ifdef __FreeBSD__
|
||||
+#include <libutil.h>
|
||||
+#include <termios.h>
|
||||
+#else
|
||||
#include <pty.h>
|
||||
+#endif
|
||||
#include <pwd.h>
|
||||
#include <sys/types.h>
|
||||
#include <sys/wait.h>
|
||||
diff --exclude-from=/home/dang/.diffrc -up -ruN libgksu-2.0.0.orig/libgksu/Makefile.am libgksu-2.0.0/libgksu/Makefile.am
|
||||
--- libgksu-2.0.0.orig/libgksu/Makefile.am 2006-09-14 22:35:52.000000000 -0400
|
||||
+++ libgksu-2.0.0/libgksu/Makefile.am 2006-12-12 11:28:01.000000000 -0500
|
||||
@@ -30,6 +30,6 @@ gksu_run_helper_SOURCES = gksu-run-helpe
|
||||
noinst_PROGRAMS = test-gksu
|
||||
test_gksu_SOURCES = test-gksu.c
|
||||
test_gksu_LDADD = libgksu2.la
|
||||
-test_gksu_LDFLAGS = `pkg-config --libs glib-2.0`
|
||||
+test_gksu_LDFLAGS = `pkg-config --libs glib-2.0 gthread-2.0`
|
||||
|
||||
EXTRA_DIST = libgksu.ver
|
||||
diff --exclude-from=/home/dang/.diffrc -up -ruN libgksu-2.0.0.orig/libgksu/Makefile.in libgksu-2.0.0/libgksu/Makefile.in
|
||||
--- libgksu-2.0.0.orig/libgksu/Makefile.in 2006-09-23 15:37:44.000000000 -0400
|
||||
+++ libgksu-2.0.0/libgksu/Makefile.in 2006-12-12 11:30:09.000000000 -0500
|
||||
@@ -283,7 +283,7 @@ gksu_run_helper_LDFLAGS = `pkg-config --
|
||||
gksu_run_helper_SOURCES = gksu-run-helper.c
|
||||
test_gksu_SOURCES = test-gksu.c
|
||||
test_gksu_LDADD = libgksu2.la
|
||||
-test_gksu_LDFLAGS = `pkg-config --libs glib-2.0`
|
||||
+test_gksu_LDFLAGS = `pkg-config --libs glib-2.0 gthread-2.0`
|
||||
EXTRA_DIST = libgksu.ver
|
||||
all: all-am
|
||||
|
||||
diff --exclude-from=/home/dang/.diffrc -up -ruN libgksu-2.0.0.orig/libgksuui/Makefile.am libgksu-2.0.0/libgksuui/Makefile.am
|
||||
--- libgksu-2.0.0.orig/libgksuui/Makefile.am 2006-09-14 22:35:31.000000000 -0400
|
||||
+++ libgksu-2.0.0/libgksuui/Makefile.am 2006-12-12 11:28:01.000000000 -0500
|
||||
@@ -12,4 +12,4 @@ includedir = ${prefix}/include/$(PACKAGE
|
||||
noinst_PROGRAMS = test-gksuui
|
||||
test_gksuui_SOURCES = test-gksuui.c
|
||||
test_gksuui_LDADD = libgksuui1.0.la
|
||||
-test_gksuui_LDFLAGS = `pkg-config --libs glib-2.0`
|
||||
+test_gksuui_LDFLAGS = `pkg-config --libs glib-2.0 gthread-2.0`
|
||||
diff --exclude-from=/home/dang/.diffrc -up -ruN libgksu-2.0.0.orig/libgksuui/Makefile.in libgksu-2.0.0/libgksuui/Makefile.in
|
||||
--- libgksu-2.0.0.orig/libgksuui/Makefile.in 2006-09-23 15:37:44.000000000 -0400
|
||||
+++ libgksu-2.0.0/libgksuui/Makefile.in 2006-12-12 11:30:22.000000000 -0500
|
||||
@@ -250,7 +250,7 @@ libgksuui1_0_la_LDFLAGS = -Wl,-O1 `pkg-c
|
||||
noinst_HEADERS = defines.h gksuui.h gksuui-dialog.h
|
||||
test_gksuui_SOURCES = test-gksuui.c
|
||||
test_gksuui_LDADD = libgksuui1.0.la
|
||||
-test_gksuui_LDFLAGS = `pkg-config --libs glib-2.0`
|
||||
+test_gksuui_LDFLAGS = `pkg-config --libs glib-2.0 gthread-2.0`
|
||||
all: all-am
|
||||
|
||||
.SUFFIXES:
|
25
deps/libgksu/libgksu-2.0.12-automake-1.11.2.patch
vendored
Normal file
25
deps/libgksu/libgksu-2.0.12-automake-1.11.2.patch
vendored
Normal file
|
@ -0,0 +1,25 @@
|
|||
Due to the following change, pkglib_PROGRAMS is invalid:
|
||||
http://git.savannah.gnu.org/cgit/automake.git/commit/?id=9ca632642b006ac6b0fc4ce0ae5b34023faa8cbf
|
||||
|
||||
https://savannah.nongnu.org/bugs/index.php?35241
|
||||
https://bugs.gentoo.org/show_bug.cgi?id=397411
|
||||
|
||||
---
|
||||
libgksu/Makefile.am | 4 ++--
|
||||
1 files changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/libgksu/Makefile.am b/libgksu/Makefile.am
|
||||
index 49362f9..3cb1090 100644
|
||||
--- a/libgksu/Makefile.am
|
||||
+++ b/libgksu/Makefile.am
|
||||
@@ -22,8 +22,8 @@ includedir = ${prefix}/include/${PACKAGE}
|
||||
pkgconfigdir = ${libdir}/pkgconfig
|
||||
pkgconfig_DATA = libgksu2.pc
|
||||
|
||||
-pkglibdir = ${libdir}/${PACKAGE}
|
||||
-pkglib_PROGRAMS = gksu-run-helper
|
||||
+gksulibdir = ${libdir}/${PACKAGE}
|
||||
+gksulib_PROGRAMS = gksu-run-helper
|
||||
gksu_run_helper_LDADD = ${GLIB_LIBS}
|
||||
gksu_run_helper_SOURCES = gksu-run-helper.c
|
||||
|
76
deps/libgksu/libgksu-2.0.7-libs.patch
vendored
Normal file
76
deps/libgksu/libgksu-2.0.7-libs.patch
vendored
Normal file
|
@ -0,0 +1,76 @@
|
|||
# https://savannah.nongnu.org/bugs/?25362
|
||||
# https://bugs.gentoo.org/show_bug.cgi?id=226837
|
||||
diff -Nura a/configure.ac b/configure.ac
|
||||
--- a/configure.ac 2009-01-19 22:15:30.000000000 +0100
|
||||
+++ b/configure.ac 2009-01-19 22:18:10.000000000 +0100
|
||||
@@ -43,6 +43,9 @@
|
||||
PKG_CHECK_MODULES(LIBGKSU, [gtk+-2.0 >= 2.4.0, gconf-2.0, libstartup-notification-1.0, gnome-keyring-1, libgtop-2.0])
|
||||
PKG_CHECK_MODULES(GKSU_PROPERTIES, [gtk+-2.0 >= 2.4.0, gconf-2.0, libglade-2.0])
|
||||
|
||||
+PKG_CHECK_MODULES(GLIB, [glib-2.0 gthread-2.0])
|
||||
+PKG_CHECK_MODULES(GTK, [gtk+-2.0 gconf-2.0])
|
||||
+
|
||||
# Checks for library functions.
|
||||
ALL_LINGUAS="ca cs da de es eu fr hu it ko lt pl pt_BR ro ru sk sv nb nl zh_CN"
|
||||
|
||||
diff -Nura a/gksu-properties/Makefile.am b/gksu-properties/Makefile.am
|
||||
--- a/gksu-properties/Makefile.am 2009-01-19 22:15:59.000000000 +0100
|
||||
+++ b/gksu-properties/Makefile.am 2009-01-19 22:19:13.000000000 +0100
|
||||
@@ -3,7 +3,7 @@
|
||||
AM_CPPFLAGS = -DLOCALEDIR=\"$(datadir)/locale\" -DDATA_DIR=\"$(datadir)\" -DPREFIX=\"$(prefix)\"
|
||||
|
||||
bin_PROGRAMS = gksu-properties
|
||||
-gksu_properties_LDFLAGS = ${GKSU_PROPERTIES_LIBS}
|
||||
+gksu_properties_LDADD = ${GKSU_PROPERTIES_LIBS}
|
||||
gksu_properties_SOURCES = gksu-properties.c
|
||||
|
||||
gladedir = ${prefix}/share/${PACKAGE}
|
||||
diff -Nura a/libgksu/Makefile.am b/libgksu/Makefile.am
|
||||
--- a/libgksu/Makefile.am 2009-01-19 22:15:59.000000000 +0100
|
||||
+++ b/libgksu/Makefile.am 2009-01-19 22:18:25.000000000 +0100
|
||||
@@ -8,8 +8,8 @@
|
||||
# major -> breaks backward compatibility (changes to existing ABI)
|
||||
# minor -> keeps compatibility (additions to the API)
|
||||
# micro -> no change to the API/ABI
|
||||
-libgksu2_la_LIBADD = ../libgksuui/libgksuui1.0.la
|
||||
-libgksu2_la_LDFLAGS = -version-info 0:2:0 -Wl,-O1 -lutil ${LIBGKSU_LIBS}
|
||||
+libgksu2_la_LIBADD = ../libgksuui/libgksuui1.0.la -lutil ${LIBGKSU_LIBS}
|
||||
+libgksu2_la_LDFLAGS = -version-info 0:2:0 -Wl,-O1
|
||||
if USE_VERSION_SCRIPT
|
||||
libgksu2_la_LDFLAGS += -Wl,--version-script=libgksu.ver
|
||||
endif
|
||||
@@ -24,12 +24,11 @@
|
||||
|
||||
pkglibdir = ${libdir}/${PACKAGE}
|
||||
pkglib_PROGRAMS = gksu-run-helper
|
||||
-gksu_run_helper_LDFLAGS = `pkg-config --libs glib-2.0`
|
||||
+gksu_run_helper_LDADD = ${GLIB_LIBS}
|
||||
gksu_run_helper_SOURCES = gksu-run-helper.c
|
||||
|
||||
noinst_PROGRAMS = test-gksu
|
||||
test_gksu_SOURCES = test-gksu.c
|
||||
-test_gksu_LDADD = libgksu2.la
|
||||
-test_gksu_LDFLAGS = `pkg-config --libs glib-2.0 gthread-2.0`
|
||||
+test_gksu_LDADD = libgksu2.la ${GLIB_LIBS}
|
||||
|
||||
EXTRA_DIST = libgksu.ver
|
||||
diff -Nura a/libgksuui/Makefile.am b/libgksuui/Makefile.am
|
||||
--- a/libgksuui/Makefile.am 2009-01-19 22:15:59.000000000 +0100
|
||||
+++ b/libgksuui/Makefile.am 2009-01-19 22:18:54.000000000 +0100
|
||||
@@ -4,12 +4,13 @@
|
||||
|
||||
noinst_LTLIBRARIES = libgksuui1.0.la
|
||||
libgksuui1_0_la_SOURCES = gksuui-dialog.c
|
||||
-libgksuui1_0_la_LDFLAGS = -Wl,-O1 `pkg-config --libs gtk+-2.0 gconf-2.0`
|
||||
+libgksuui1_0_la_LDFLAGS = -Wl,-O1
|
||||
+libgksuui1_0_la_LIBADD = ${GTK_LIBS}
|
||||
|
||||
noinst_HEADERS = defines.h gksuui.h gksuui-dialog.h
|
||||
includedir = ${prefix}/include/$(PACKAGE)
|
||||
|
||||
noinst_PROGRAMS = test-gksuui
|
||||
test_gksuui_SOURCES = test-gksuui.c
|
||||
-test_gksuui_LDADD = libgksuui1.0.la
|
||||
-test_gksuui_LDFLAGS = `pkg-config --libs glib-2.0 gthread-2.0`
|
||||
+test_gksuui_LDADD = libgksuui1.0.la ${GLIB_LIBS}
|
||||
+
|
5
deps/libgksu/libgksu.SlackBuild
vendored
5
deps/libgksu/libgksu.SlackBuild
vendored
|
@ -24,7 +24,7 @@
|
|||
|
||||
PRGNAM=libgksu
|
||||
VERSION=${VERSION:-2.0.12}
|
||||
BUILD=${BUILD:-1}
|
||||
BUILD=${BUILD:-2}
|
||||
TAG=${TAG:-_msb}
|
||||
|
||||
if [ -z "$ARCH" ]; then
|
||||
|
@ -74,6 +74,9 @@ find . \
|
|||
-exec chmod 644 {} \;
|
||||
|
||||
patch -p1 < $CWD/libgksu-format.patch
|
||||
patch -p1 < $CWD/libgksu-2.0.0-fbsd.patch
|
||||
patch -p1 < $CWD/libgksu-2.0.7-libs.patch
|
||||
patch -p1 < $CWD/libgksu-2.0.12-automake-1.11.2.patch
|
||||
|
||||
LDFLAGS="-lgtk" \
|
||||
CFLAGS="$SLKCFLAGS" \
|
||||
|
|
Loading…
Reference in a new issue