[Xfce4-commits] [xfce/libxfce4ui] 03/04: feat: Switch to Gtk3 default, Gtk2 Optional
noreply at xfce.org
noreply at xfce.org
Sat Jun 24 19:35:28 CEST 2017
This is an automated email from the git hooks/post-receive script.
e r i c p u s h e d a c o m m i t t o b r a n c h m a s t e r
in repository xfce/libxfce4ui.
commit c694a84ecb24c8d16f78bdc37561992001286822
Author: Eric Koegel <eric.koegel at gmail.com>
Date: Sat Jun 24 13:16:44 2017 +0300
feat: Switch to Gtk3 default, Gtk2 Optional
And with that change, make the xfce-about dialog Gtk3.
---
configure.ac.in | 17 ++++++---
libxfce4kbd-private/Makefile.am | 56 +++++++++++++++-------------
libxfce4ui/Makefile.am | 71 ++++++++++++++++++++++--------------
tests/Makefile.am | 12 ++++--
xfce4-about/Makefile.am | 8 ++--
xfce4-about/xfce4-about-dialog.glade | 2 +
6 files changed, 99 insertions(+), 67 deletions(-)
diff --git a/configure.ac.in b/configure.ac.in
index f88b029..6bf39cc 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -127,16 +127,16 @@ dnl ***********************************
dnl *** Check for required packages ***
dnl ***********************************
XDT_CHECK_PACKAGE([GLIB], [glib-2.0], [2.42.0])
-XDT_CHECK_PACKAGE([GTK2], [gtk+-2.0], [2.24.0])
+XDT_CHECK_PACKAGE([GTK3], [gtk+-3.0], [3.18.0])
XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.12.0])
dnl ***********************************************************
-dnl *** Optional support for a GTK+3 version of the library ***
+dnl *** Optional support for a GTK+2 version of the library ***
dnl ***********************************************************
-XDT_CHECK_OPTIONAL_PACKAGE([GTK3],
- [gtk+-3.0], [3.18.0], [gtk3],
- [GTK+ 3 support])
-AM_CONDITIONAL([ENABLE_GTK3_LIBRARY], [test "x$GTK3_FOUND" = "xyes"])
+XDT_CHECK_OPTIONAL_PACKAGE([GTK2],
+ [gtk+-2.0], [2.24.0], [gtk2],
+ [GTK+ 2 support])
+AM_CONDITIONAL([ENABLE_GTK2_LIBRARY], [test "x$GTK2_FOUND" = "xyes"])
AC_DEFINE(GLIB_VERSION_MIN_REQUIRED, GLIB_VERSION_2_42, [Ignore post 2.42 deprecations])
AC_DEFINE(GLIB_VERSION_MAX_ALLOWED, GLIB_VERSION_2_42, [Prevent post 2.42 APIs])
@@ -359,6 +359,11 @@ dnl ***************************
echo
echo "Build Configuration:"
echo
+if test x"$GTK2_FOUND" = x"yes"; then
+echo "* GTK2 support: yes"
+else
+echo "* GTK2 support: no"
+fi
if test x"$GLADEUI_FOUND" = x"yes"; then
echo "* Glade Interface Designer: yes"
echo " - Catalog directory: $GLADEUI_CATALOGDIR"
diff --git a/libxfce4kbd-private/Makefile.am b/libxfce4kbd-private/Makefile.am
index 36dcc75..f1c9c5e 100644
--- a/libxfce4kbd-private/Makefile.am
+++ b/libxfce4kbd-private/Makefile.am
@@ -31,27 +31,28 @@ libxfce4kbd_sources = \
xfce-shortcuts.c \
xfce-shortcuts-xfwm4.c
-lib_LTLIBRARIES = libxfce4kbd-private-2.la
-libxfce4kbd_private_includedir = \
- $(includedir)/xfce4/libxfce4kbd-private-$(LIBXFCE4KBD_PRIVATE_VERSION_API)/libxfce4kbd-private
+lib_LTLIBRARIES = libxfce4kbd-private-3.la
-libxfce4kbd_private_include_HEADERS = \
+libxfce4kbd3_private_includedir = \
+ $(includedir)/xfce4/libxfce4kbd-private-3/libxfce4kbd-private
+
+libxfce4kbd3_private_include_HEADERS = \
$(libxfce4kbd_headers)
-libxfce4kbd_private_2_la_SOURCES = \
+libxfce4kbd_private_3_la_SOURCES = \
$(libxfce4kbd_sources)
-libxfce4kbd_private_2_la_CFLAGS = \
+libxfce4kbd_private_3_la_CFLAGS = \
$(PLATFORM_CFLAGS) \
$(GLIB_CFLAGS) \
- $(GTK2_CFLAGS) \
+ $(GTK3_CFLAGS) \
$(LIBX11_CFLAGS) \
$(LIBXFCE4UTIL_CFLAGS) \
$(XFCONF_CFLAGS) \
$(PLATFORM_CFLAGS)
-libxfce4kbd_private_2_la_LDFLAGS = \
+libxfce4kbd_private_3_la_LDFLAGS = \
-export-dynamic \
-version-info $(LIBXFCE4KBD_PRIVATE_VERINFO) \
-export-symbols-regex "^[^_].*" \
@@ -59,10 +60,10 @@ libxfce4kbd_private_2_la_LDFLAGS = \
$(LIBX11_LDFLAGS) \
$(PLATFORM_LDFLAGS)
-libxfce4kbd_private_2_la_LIBADD = \
- $(top_builddir)/libxfce4ui/libxfce4ui-$(LIBXFCE4UI_VERSION_API).la \
+libxfce4kbd_private_3_la_LIBADD = \
+ $(top_builddir)/libxfce4ui/libxfce4ui-2.la \
$(GLIB_LIBS) \
- $(GTK2_LIBS) \
+ $(GTK3_LIBS) \
$(LIBX11_LIBS) \
$(LIBXFCE4UTIL_LIBS) \
$(XFCONF_LIBS)
@@ -71,31 +72,33 @@ settingsdir = $(sysconfdir)/xdg/xfce4/xfconf/xfce-perchannel-xml
settings_DATA = xfce4-keyboard-shortcuts.xml
pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = libxfce4kbd-private-2.pc
+pkgconfig_DATA = libxfce4kbd-private-3.pc
-if ENABLE_GTK3_LIBRARY
-lib_LTLIBRARIES += libxfce4kbd-private-3.la
+if ENABLE_GTK2_LIBRARY
-libxfce4kbd3_private_includedir = \
- $(includedir)/xfce4/libxfce4kbd-private-3/libxfce4kbd-private
-libxfce4kbd3_private_include_HEADERS = \
+lib_LTLIBRARIES += libxfce4kbd-private-2.la
+
+libxfce4kbd_private_includedir = \
+ $(includedir)/xfce4/libxfce4kbd-private-$(LIBXFCE4KBD_PRIVATE_VERSION_API)/libxfce4kbd-private
+
+libxfce4kbd_private_include_HEADERS = \
$(libxfce4kbd_headers)
-libxfce4kbd_private_3_la_SOURCES = \
+libxfce4kbd_private_2_la_SOURCES = \
$(libxfce4kbd_sources)
-libxfce4kbd_private_3_la_CFLAGS = \
+libxfce4kbd_private_2_la_CFLAGS = \
$(PLATFORM_CFLAGS) \
$(GLIB_CFLAGS) \
- $(GTK3_CFLAGS) \
+ $(GTK2_CFLAGS) \
$(LIBX11_CFLAGS) \
$(LIBXFCE4UTIL_CFLAGS) \
$(XFCONF_CFLAGS) \
$(PLATFORM_CFLAGS)
-libxfce4kbd_private_3_la_LDFLAGS = \
+libxfce4kbd_private_2_la_LDFLAGS = \
-export-dynamic \
-version-info $(LIBXFCE4KBD_PRIVATE_VERINFO) \
-export-symbols-regex "^[^_].*" \
@@ -103,15 +106,18 @@ libxfce4kbd_private_3_la_LDFLAGS = \
$(LIBX11_LDFLAGS) \
$(PLATFORM_LDFLAGS)
-libxfce4kbd_private_3_la_LIBADD = \
- $(top_builddir)/libxfce4ui/libxfce4ui-2.la \
+libxfce4kbd_private_2_la_LIBADD = \
+ $(top_builddir)/libxfce4ui/libxfce4ui-$(LIBXFCE4UI_VERSION_API).la \
$(GLIB_LIBS) \
- $(GTK3_LIBS) \
+ $(GTK2_LIBS) \
$(LIBX11_LIBS) \
$(LIBXFCE4UTIL_LIBS) \
$(XFCONF_LIBS)
-pkgconfig_DATA += libxfce4kbd-private-3.pc
+
+pkgconfig_DATA += libxfce4kbd-private-2.pc
+
+
endif
diff --git a/libxfce4ui/Makefile.am b/libxfce4ui/Makefile.am
index fca91ec..cb68aad 100644
--- a/libxfce4ui/Makefile.am
+++ b/libxfce4ui/Makefile.am
@@ -1,4 +1,6 @@
CLEANFILES =
+lib_LTLIBRARIES =
+pkgconfig_DATA =
AM_CPPFLAGS = \
-I$(top_srcdir) \
@@ -53,38 +55,12 @@ libxfce4ui_includedir = \
libxfce4ui_include_HEADERS = \
$(libxfce4ui_headers)
-lib_LTLIBRARIES = libxfce4ui-1.la
-libxfce4ui_1_la_SOURCES = \
- $(libxfce4ui_sources)
-libxfce4ui_1_la_CFLAGS = \
- $(LIBSM_CFLAGS) \
- $(GTK2_CFLAGS) \
- $(LIBSTARTUP_NOTIFICATION_CFLAGS) \
- $(LIBXFCE4UTIL_CFLAGS) \
- $(PLATFORM_CFLAGS)
-
-libxfce4ui_1_la_LDFLAGS = \
- -version-info $(LIBXFCE4UI_VERINFO) \
- -export-symbols-regex "^[^_].*" \
- -no-undefined \
- $(LIBSM_LDFLAGS) \
- $(PLATFORM_LDFLAGS)
-
-libxfce4ui_1_la_LIBADD = \
- $(LIBSM_LIBS) \
- $(GTK2_LIBS) \
- $(LIBSTARTUP_NOTIFICATION_LIBS) \
- $(LIBXFCE4UTIL_LIBS)
-
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = libxfce4ui-1.pc
##
## GTK+ 3 support library
##
-if ENABLE_GTK3_LIBRARY
libxfce4ui2_includedir = \
$(includedir)/xfce4/libxfce4ui-2/libxfce4ui
@@ -92,7 +68,8 @@ libxfce4ui2_includedir = \
libxfce4ui2_include_HEADERS = \
$(libxfce4ui_headers)
-lib_LTLIBRARIES += libxfce4ui-2.la
+lib_LTLIBRARIES += \
+ libxfce4ui-2.la
libxfce4ui_2_la_SOURCES = \
$(libxfce4ui_sources)
@@ -117,7 +94,9 @@ libxfce4ui_2_la_LIBADD = \
$(LIBSTARTUP_NOTIFICATION_LIBS) \
$(LIBXFCE4UTIL_LIBS)
-pkgconfig_DATA += libxfce4ui-2.pc
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA += \
+ libxfce4ui-2.pc
include $(INTROSPECTION_MAKEFILE)
INTROSPECTION_GIRS =
@@ -153,6 +132,42 @@ CLEANFILES += $(gir_DATA) $(typelib_DATA)
endif
# endif HAVE_INTROSPECTION
+
+##
+## GTK+ 2 support library
+##
+if ENABLE_GTK2_LIBRARY
+
+lib_LTLIBRARIES += \
+ libxfce4ui-1.la
+
+libxfce4ui_1_la_SOURCES = \
+ $(libxfce4ui_sources)
+
+libxfce4ui_1_la_CFLAGS = \
+ $(LIBSM_CFLAGS) \
+ $(GTK2_CFLAGS) \
+ $(LIBSTARTUP_NOTIFICATION_CFLAGS) \
+ $(LIBXFCE4UTIL_CFLAGS) \
+ $(PLATFORM_CFLAGS)
+
+libxfce4ui_1_la_LDFLAGS = \
+ -version-info $(LIBXFCE4UI_VERINFO) \
+ -export-symbols-regex "^[^_].*" \
+ -no-undefined \
+ $(LIBSM_LDFLAGS) \
+ $(PLATFORM_LDFLAGS)
+
+libxfce4ui_1_la_LIBADD = \
+ $(LIBSM_LIBS) \
+ $(GTK2_LIBS) \
+ $(LIBSTARTUP_NOTIFICATION_LIBS) \
+ $(LIBXFCE4UTIL_LIBS)
+
+pkgconfig_DATA += \
+ libxfce4ui-1.pc
+
+
endif
##
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 0cd6e55..ea03867 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -21,11 +21,15 @@ AM_CPPFLAGS = \
-I$(top_srcdir) \
-DG_LOG_DOMAIN=\"libxfce4ui-tests\"
-noinst_PROGRAMS = \
- test-ui-gtk2
+noinst_PROGRAMS =
# test-ui-gtk2
+
+noinst_PROGRAMS += \
+ test-ui-gtk2
+
+if ENABLE_GTK2_LIBRARY
test_ui_gtk2_SOURCES = \
test-ui.c
@@ -46,8 +50,9 @@ test_ui_gtk2_LDADD = \
$(LIBXFCE4UTIL_LIBS) \
$(top_builddir)/libxfce4ui/libxfce4ui-1.la
+endif
+
# test-ui-gtk3
-if ENABLE_GTK3_LIBRARY
noinst_PROGRAMS += \
test-ui-gtk3
@@ -70,4 +75,3 @@ test_ui_gtk3_LDADD = \
$(LIBSTARTUP_NOTIFICATION_LIBS) \
$(LIBXFCE4UTIL_LIBS) \
$(top_builddir)/libxfce4ui/libxfce4ui-2.la
-endif
diff --git a/xfce4-about/Makefile.am b/xfce4-about/Makefile.am
index 50956f7..aeadead 100644
--- a/xfce4-about/Makefile.am
+++ b/xfce4-about/Makefile.am
@@ -20,16 +20,16 @@ xfce4_about_SOURCES = \
xfce4_about_CFLAGS = \
$(LIBXFCE4UTIL_CFLAGS) \
- $(GTK2_CFLAGS) \
+ $(GTK3_CFLAGS) \
$(PLATFORM_CFLAGS)
xfce4_about_LDADD = \
- $(top_builddir)/libxfce4ui/libxfce4ui-$(LIBXFCE4UI_VERSION_API).la \
+ $(top_builddir)/libxfce4ui/libxfce4ui-2.la \
$(LIBXFCE4UTIL_LIBS) \
- $(GTK2_LIBS)
+ $(GTK3_LIBS)
xfce4_about_DEPENDENCIES = \
- $(top_builddir)/libxfce4ui/libxfce4ui-$(LIBXFCE4UI_VERSION_API).la
+ $(top_builddir)/libxfce4ui/libxfce4ui-2.la
desktopdir = $(datadir)/applications
desktop_in_files = xfce4-about.desktop.in
diff --git a/xfce4-about/xfce4-about-dialog.glade b/xfce4-about/xfce4-about-dialog.glade
index c71262d..c45f3f0 100644
--- a/xfce4-about/xfce4-about-dialog.glade
+++ b/xfce4-about/xfce4-about-dialog.glade
@@ -19,6 +19,7 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="border_width">6</property>
+ <property name="expand">TRUE</property>
<child>
<object class="GtkScrolledWindow" id="scrolledwindow1">
<property name="visible">True</property>
@@ -296,6 +297,7 @@
<property name="left_margin">3</property>
<property name="right_margin">3</property>
<property name="cursor_visible">False</property>
+ <property name="expand">TRUE</property>
</object>
</child>
</object>
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the Xfce4-commits
mailing list