forked from pool/lxsession
95 lines
3.0 KiB
Diff
95 lines
3.0 KiB
Diff
|
Index: lxsession-0.4.9.3.git20130914/configure.ac
|
||
|
|
===================================================================
|
||
|
|
--- lxsession-0.4.9.3.git20130914.orig/configure.ac
|
||
|
|
+++ lxsession-0.4.9.3.git20130914/configure.ac
|
||
|
|
@@ -53,12 +53,15 @@ AC_ARG_ENABLE([gtk3],
|
||
|
|
if test "x$enable_gtk3" = "xyes" ; then
|
||
|
|
CFLAGS="$CFLAGS -DENABLE_GTK3"
|
||
|
|
gtk_modules="gtk+-3.0 >= 3.0.0"
|
||
|
|
+ VALA_GTK_LIBS="gtk+-3.0"
|
||
|
|
else
|
||
|
|
gtk_modules="gtk+-2.0 >= 2.6.0"
|
||
|
|
+ VALA_GTK_LIBS="gtk+-2.0"
|
||
|
|
fi
|
||
|
|
PKG_CHECK_MODULES(GTK, [$gtk_modules])
|
||
|
|
AC_SUBST(GTK_CFLAGS)
|
||
|
|
AC_SUBST(GTK_LIBS)
|
||
|
|
+AC_SUBST(VALA_GTK_LIBS)
|
||
|
|
|
||
|
|
PKG_CHECK_MODULES(X11, [x11])
|
||
|
|
AC_SUBST(X11_CFLAGS)
|
||
|
|
Index: lxsession-0.4.9.3.git20130914/lxclipboard/Makefile.am
|
||
|
|
===================================================================
|
||
|
|
--- lxsession-0.4.9.3.git20130914.orig/lxclipboard/Makefile.am
|
||
|
|
+++ lxsession-0.4.9.3.git20130914/lxclipboard/Makefile.am
|
||
|
|
@@ -7,7 +7,7 @@ lxclipboard_SOURCES = \
|
||
|
|
|
||
|
|
lxclipboard_VALAFLAGS = \
|
||
|
|
--vapidir=$(srcdir)/../vapi \
|
||
|
|
- --pkg gtk+-2.0 \
|
||
|
|
+ --pkg @VALA_GTK_LIBS@ \
|
||
|
|
--pkg lxclipboard \
|
||
|
|
$(NULL)
|
||
|
|
|
||
|
|
Index: lxsession-0.4.9.3.git20130914/lxpolkit/Makefile.am
|
||
|
|
===================================================================
|
||
|
|
--- lxsession-0.4.9.3.git20130914.orig/lxpolkit/Makefile.am
|
||
|
|
+++ lxsession-0.4.9.3.git20130914/lxpolkit/Makefile.am
|
||
|
|
@@ -10,7 +10,7 @@ lxpolkit_SOURCES = \
|
||
|
|
|
||
|
|
lxpolkit_VALAFLAGS = \
|
||
|
|
--vapidir=$(srcdir)/../vapi \
|
||
|
|
- --pkg gtk+-2.0 \
|
||
|
|
+ --pkg @VALA_GTK_LIBS@ \
|
||
|
|
--pkg lxpolkit \
|
||
|
|
$(NULL)
|
||
|
|
|
||
|
|
Index: lxsession-0.4.9.3.git20130914/lxsession-db/Makefile.am
|
||
|
|
===================================================================
|
||
|
|
--- lxsession-0.4.9.3.git20130914.orig/lxsession-db/Makefile.am
|
||
|
|
+++ lxsession-0.4.9.3.git20130914/lxsession-db/Makefile.am
|
||
|
|
@@ -7,7 +7,7 @@ lxsession_db_SOURCES = \
|
||
|
|
|
||
|
|
lxsession_db_VALAFLAGS = \
|
||
|
|
--vapidir=$(srcdir)/../vapi \
|
||
|
|
- --pkg gtk+-2.0 \
|
||
|
|
+ --pkg @VALA_GTK_LIBS@ \
|
||
|
|
--pkg gee-0.8 \
|
||
|
|
$(NULL)
|
||
|
|
|
||
|
|
Index: lxsession-0.4.9.3.git20130914/lxsession-default-apps/Makefile.am
|
||
|
|
===================================================================
|
||
|
|
--- lxsession-0.4.9.3.git20130914.orig/lxsession-default-apps/Makefile.am
|
||
|
|
+++ lxsession-0.4.9.3.git20130914/lxsession-default-apps/Makefile.am
|
||
|
|
@@ -9,7 +9,7 @@ lxsession_default_apps_SOURCES = \
|
||
|
|
|
||
|
|
lxsession_default_apps_VALAFLAGS = \
|
||
|
|
--vapidir=$(srcdir)/../vapi \
|
||
|
|
- --pkg gtk+-2.0 \
|
||
|
|
+ --pkg @VALA_GTK_LIBS@ \
|
||
|
|
--pkg dbus-glib-1 \
|
||
|
|
--pkg gio-2.0 \
|
||
|
|
--pkg posix \
|
||
|
|
Index: lxsession-0.4.9.3.git20130914/lxsession/Makefile.am
|
||
|
|
===================================================================
|
||
|
|
--- lxsession-0.4.9.3.git20130914.orig/lxsession/Makefile.am
|
||
|
|
+++ lxsession-0.4.9.3.git20130914/lxsession/Makefile.am
|
||
|
|
@@ -7,7 +7,7 @@ buildinclip_SOURCES = \
|
||
|
|
|
||
|
|
buildinclip_VALAFLAGS = \
|
||
|
|
--pkg lxclipboard \
|
||
|
|
- --pkg gtk+-2.0 \
|
||
|
|
+ --pkg @VALA_GTK_LIBS@ \
|
||
|
|
-D BUILDIN_CLIPBOARD \
|
||
|
|
$(NULL)
|
||
|
|
|
||
|
|
@@ -28,7 +28,7 @@ buildinpolkit_SOURCES = \
|
||
|
|
|
||
|
|
buildinpolkit_VALAFLAGS = \
|
||
|
|
--pkg lxpolkit \
|
||
|
|
- --pkg gtk+-2.0 \
|
||
|
|
+ --pkg @VALA_GTK_LIBS@ \
|
||
|
|
-D BUILDIN_POLKIT \
|
||
|
|
$(NULL)
|
||
|
|
|