[Xfce4-commits] <parole:bluesabre/gtk3> Remove building in gtk2

[Sean Davis]

Updating branch refs/heads/bluesabre/gtk3
         to d0f9677e793eea4bdb8ba2289f16b74275ceff60 (commit)
       from 35ea6ecf2c09ceb59a73604ce0627ebf4900d12c (commit)

commit d0f9677e793eea4bdb8ba2289f16b74275ceff60
Author: Sean Davis <smd.seandavis at gmail.com>
Date:   Tue Aug 20 07:07:00 2013 -0400

    Remove building in gtk2

 configure.ac.in             |   26 +++++---------------------
 data/interfaces/Makefile.am |   32 --------------------------------
 2 files changed, 5 insertions(+), 53 deletions(-)

diff --git a/configure.ac.in b/configure.ac.in
index d621f66..6c640a8 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -78,7 +78,7 @@ XDT_I18N([@LINGUAS@])
 #==================================================== #
 #          Check for required packages 		      #
 #=====================================================#
-m4_define([gtk_minimum_version], [2.24.0])
+m4_define([gtk_minimum_version], [3.0.0])
 m4_define([glib_minimum_version], [2.32.0])
 
 dnl gstreamer version
@@ -128,20 +128,10 @@ XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0],[libxfce4util_minimum_versi
 XDT_CHECK_PACKAGE([XFCONF], [libxfconf-0], [4.10.0])
 
 dnl ************************************
-dnl *** Compile against GTK3 or GTK2 ***
+dnl *** Compile against GTK3 ***
 dnl ************************************
-AC_ARG_ENABLE([gtk3],
-              [AC_HELP_STRING([--enable-gtk3],
-              [Compile against GTK+-3.0 (default=disabled)])],
-              [enable_gtk3=$enableval], [enable_gtk3=no])
-if test "x$enable_gtk3" = "xyes"; then
-    XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-2], [4.10.0])
-    XDT_CHECK_PACKAGE([GTK], [gtk+-3.0], [3.2.0])
-else
-    XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-1], [4.10.0])
-    XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [2.24.0])
-fi
-AM_CONDITIONAL([ENABLE_GTK3], [test "x$enable_gtk3" = "xyes"])
+XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-2], [4.10.0])
+XDT_CHECK_PACKAGE([GTK], [gtk+-3.0], [3.2.0])
 
 XDT_CHECK_PACKAGE([GST], [gstreamer-${gstreamer_api_version}], [${gstreamer_minimum_version}])
 XDT_CHECK_PACKAGE([GST_BASE], [gstreamer-base-${gstreamer_api_version}], [${gstreamer_minimum_version}])
@@ -286,12 +276,6 @@ docs/plugin-api/Makefile
 po/Makefile.in
 ])
 
-if test x"$enable_gtk3" = x"yes"; then
-gtk_toolkit_version="GTK+-3"
-else
-gtk_toolkit_version="GTK+-2"
-fi
-
 echo "
 ------------------------------------------------------
             Parole Media Player $VERSION
@@ -304,7 +288,7 @@ echo "
         Debug:                          $enable_debug
         Building plugin api docs:       ${enable_gtk_doc}
         GStreamer API version:          ${gstreamer_api_version}
-        GTK+ version:                   $gtk_toolkit_version
+        GTK+ version:                   GTK+-3
 
         Optional dependencies:
         ======================
diff --git a/data/interfaces/Makefile.am b/data/interfaces/Makefile.am
index 5a2c446..55badea 100644
--- a/data/interfaces/Makefile.am
+++ b/data/interfaces/Makefile.am
@@ -10,8 +10,6 @@ interfaces =					\
 interfaces_h = 					\
 	$(interfaces:.ui=_ui.h)
 
-
-if ENABLE_GTK3
 interfaces =					\
 	parole-3.ui				\
 	parole-settings-3.ui			\
@@ -47,36 +45,6 @@ plugins_ui.h: plugins-3.ui
 	
 endif
 
-else
-
-if MAINTAINER_MODE
-BUILT_SOURCES = $(interfaces_h)
-
-parole_ui.h: parole.ui
-	xdt-csource --static --strip-comments --strip-content --name=parole_ui $< > $@
-
-parole-settings_ui.h: parole-settings.ui
-	xdt-csource --static --strip-comments --strip-content --name=parole_settings_ui $< > $@
-
-playlist_ui.h: playlist.ui
-	xdt-csource --static --strip-comments --strip-content --name=playlist_ui $< > $@
-
-mediachooser_ui.h: mediachooser.ui
-	xdt-csource --static --strip-comments --strip-content --name=mediachooser_ui $< > $@
-
-save-playlist_ui.h: save-playlist.ui
-	xdt-csource --static --strip-comments --strip-content --name=save_playlist_ui $< > $@
-
-open-location_ui.h: open-location.ui
-	xdt-csource --static --strip-comments --strip-content --name=open_location_ui $< > $@
-
-plugins_ui.h: plugins.ui
-	xdt-csource --static --strip-comments --strip-content --name=plugins_ui $< > $@
-
-endif
-
-endif
-
 DISTCLEANFILES =					\
 	$(interfaces_h)