File libgksu-fix-compilation.patch of Package libgksu
Only in a: aclocal.m4
Only in a: configure
--- a/configure.ac
+++ b/configure.ac
@@ -3,8 +3,8 @@
AC_PREREQ(2.57)
-AC_INIT(libgksu, 2.0.12, kov@debian.org)
-AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
+AC_INIT([libgksu], [2.0.12], [kov@debian.org])
+AM_INIT_AUTOMAKE([foreign])
AC_CONFIG_SRCDIR(libgksu/libgksu.c)
AM_CONFIG_HEADER(config.h)
--- a/gksu-properties/gksu-properties.c
+++ b/gksu-properties/gksu-properties.c
@@ -115,12 +115,12 @@ create_dialog ()
{
GdkPixbuf *icon;
main_window = GTK_WIDGET (gtk_builder_get_object (gui, "main_window"));
- icon = gdk_pixbuf_new_from_file (DATA_DIR"/pixmaps/gksu.png", NULL);
+ icon = gdk_pixbuf_new_from_file (DATA_DIR"/icons/hicolor/48x48/apps/gksu.png", NULL);
if (icon)
gtk_window_set_icon (GTK_WINDOW(main_window), icon);
else
g_warning ("Error loading window icon %s",
- DATA_DIR "/pixmaps/gksu.png\n");
+ DATA_DIR "/icons/hicolor/48x48/apps/gksu.png\n");
grab_combo = GTK_WIDGET (gtk_builder_get_object (gui, "grab_combo"));
update_grab_combo ();
--- a/gksu-properties/gksu-properties.desktop.in
+++ b/gksu-properties/gksu-properties.desktop.in
@@ -3,9 +3,9 @@ Encoding=UTF-8
_Name=Privilege granting
_Comment=Configure behavior of the privilege-granting tool
Exec=gksu-properties
-Icon=gksu.png
+Icon=gksu
StartupNotify=true
Terminal=false
Type=Application
Categories=GNOME;GTK;Application;Settings;AdvancedSettings;
-OnlyShowIn=GNOME;XFCE;
+OnlyShowIn=MATE;GNOME;XFCE;
--- a/gksu-properties/Makefile.am
+++ b/gksu-properties/Makefile.am
@@ -1,6 +1,5 @@
AM_CFLAGS = -g -O2 -Wall -Wl,--export-dynamic
-INCLUDES = ${GKSU_PROPERTIES_CFLAGS}
-AM_CPPFLAGS = -DLOCALEDIR=\"$(datadir)/locale\" -DDATA_DIR=\"$(datadir)\" -DPREFIX=\"$(prefix)\"
+AM_CPPFLAGS = ${GKSU_PROPERTIES_CFLAGS} -DLOCALEDIR=\"$(datadir)/locale\" -DDATA_DIR=\"$(datadir)\" -DPREFIX=\"$(prefix)\"
bin_PROGRAMS = gksu-properties
gksu_properties_LDFLAGS = ${GKSU_PROPERTIES_LIBS}
Only in a/gksu-properties: Makefile.in
Only in a: install-sh
--- a/libgksu/libgksu.c
+++ b/libgksu/libgksu.c
@@ -1936,7 +1936,7 @@ gksu_su_fuller (GksuContext *context,
GQuark gksu_quark;
int i = 0;
- gchar auxcommand[] = PREFIX "/lib/" PACKAGE "/gksu-run-helper";
+ gchar auxcommand[] = LIBEXECDIR "/gksu/gksu-run-helper";
int fdpty;
pid_t pid;
--- a/libgksu/Makefile.am
+++ b/libgksu/Makefile.am
@@ -1,6 +1,6 @@
AM_CFLAGS = -g -O2 -Wall
INCLUDES = ${LIBGKSU_CFLAGS}
-AM_CPPFLAGS = -DLOCALEDIR=\"$(datadir)/locale\" -DDATA_DIR=\"$(datadir)\" -DPREFIX=\"$(prefix)\"
+AM_CPPFLAGS = -DLOCALEDIR=\"$(datadir)/locale\" -DDATA_DIR=\"$(datadir)\" -DLIBEXECDIR=\"$(libexecdir)\"
if SUDO_FORKPTY
AM_CPPFLAGS += -DSUDO_FORKPTY
@@ -26,12 +26,12 @@ includedir = ${prefix}/include/${PACKAGE
pkgconfigdir = ${libdir}/pkgconfig
pkgconfig_DATA = libgksu2.pc
-pkglibdir = ${libdir}/${PACKAGE}
-pkglib_PROGRAMS = gksu-run-helper
+pkgbindir = ${libexecdir}/gksu
+pkgbin_PROGRAMS = gksu-run-helper
gksu_run_helper_LDFLAGS = `pkg-config --libs glib-2.0`
gksu_run_helper_SOURCES = gksu-run-helper.c
-noinst_PROGRAMS = test-gksu
+EXTRA_PROGRAMS = test-gksu
test_gksu_SOURCES = test-gksu.c
test_gksu_LDADD = libgksu2.la
test_gksu_LDFLAGS = `pkg-config --libs glib-2.0`
Only in a/libgksu: Makefile.in
--- a/libgksuui/Makefile.am
+++ b/libgksuui/Makefile.am
@@ -1,15 +1,15 @@
AM_CFLAGS = -g -O2 -Wall
-INCLUDES = `pkg-config --cflags gtk+-2.0 gconf-2.0`
+INCLUDES = `pkg-config --cflags x11 gtk+-2.0 gconf-2.0`
AM_CPPFLAGS = -DLOCALEDIR=\"$(datadir)/locale\" -DDATA_DIR=\"$(datadir)\" -DPREFIX=\"$(prefix)\"
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 `pkg-config --libs x11 gtk+-2.0 gconf-2.0`
noinst_HEADERS = defines.h gksuui.h gksuui-dialog.h
includedir = ${prefix}/include/$(PACKAGE)
-noinst_PROGRAMS = test-gksuui
+EXTRA_PROGRAMS = test-gksuui
test_gksuui_SOURCES = test-gksuui.c
test_gksuui_LDADD = libgksuui1.0.la
test_gksuui_LDFLAGS = `pkg-config --libs glib-2.0`
Only in a/libgksuui: Makefile.in
--- a/Makefile.am
+++ b/Makefile.am
@@ -10,18 +10,18 @@ schemas_in_files = gksu.schemas.in
schemas_DATA = $(schemas_in_files:.schemas.in=.schemas)
@INTLTOOL_SCHEMAS_RULE@
-pixmapdir = $(datadir)/pixmaps
+pixmapdir = $(datadir)/icons/hicolor/48x48/apps
dist_pixmap_DATA = gksu.png
EXTRA_DIST = config.rpath mkinstalldirs intltool-extract.in intltool-merge.in intltool-update.in gksu.schemas.in
if GCONF_SCHEMAS_INSTALL
install-data-local:
- if test -z "$(DESTDIR)" ; then \
- for p in $(schemas_DATA) ; do \
- GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(srcdir)/$$p ; \
- done \
- fi
+ if test -z "$(DESTDIR)" ; then \
+ for p in $(schemas_DATA) ; do \
+ GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(srcdir)/$$p ; \
+ done \
+ fi
else
install-data-local:
endif
Only in a: Makefile.in