GNOME.org
 

[gnome-desktop] Port to GTK+ 3.0

commit 427510a4778519fb523eac9aa6a30cd3175b83a5
Author: Bastien Nocera <hadess hadess net>
Date:   Fri Jun 11 12:43:01 2010 +0100

    Port to GTK+ 3.0
    
    And make it parallel installable with GTK+ 2.0 version.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=621291

 configure.in                                       |   14 +++++++-------
 libgnome-desktop/Makefile.am                       |   16 ++++++++--------
 ...d.pc.in => gnome-desktop-3.0-uninstalled.pc.in} |    6 +++---
 ...e-desktop-2.0.pc.in => gnome-desktop-3.0.pc.in} |    8 ++++----
 libgnome-desktop/libgnome/Makefile.am              |    2 +-
 libgnome-desktop/libgnomeui/Makefile.am            |    2 +-
 6 files changed, 24 insertions(+), 24 deletions(-)
---
diff --git a/configure.in b/configure.in
index d2ee94e..3433977 100644
--- a/configure.in
+++ b/configure.in
@@ -30,7 +30,7 @@ AC_SUBST(ACLOCAL_AMFLAGS, "\${ACLOCAL_FLAGS}")
 #   change to C+1:0:0
 # - If the interface is the same as the previous version, change to C:R+1:A
 
-LT_VERSION=18:1:1
+LT_VERSION=0:0:0
 AC_SUBST(LT_VERSION)
 
 AM_MAINTAINER_MODE
@@ -111,8 +111,8 @@ fi
 dnl If you add a version number here, you *must* add an AC_SUBST line for
 dnl it too, or it will never make it into the spec file!
 
-GDK_PIXBUF_REQUIRED=2.4.0
-GTK_REQUIRED=2.18.0
+GDK_PIXBUF_REQUIRED=2.90.2
+GTK_REQUIRED=2.90.2
 GLIB_REQUIRED=2.19.1
 GCONF_REQUIRED=2.0.0
 STARTUP_NOTIFICATION_REQUIRED=0.5
@@ -175,7 +175,7 @@ AC_SUBST(RANDR_PACKAGE)
 
 dnl pkg-config dependency checks
 
-PKG_CHECK_MODULES(GNOME_DESKTOP, gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED gconf-2.0 >= $GCONF_REQUIRED $STARTUP_NOTIFICATION_PACKAGE $RANDR_PACKAGE)
+PKG_CHECK_MODULES(GNOME_DESKTOP, gdk-pixbuf-3.0 >= $GDK_PIXBUF_REQUIRED gtk+-3.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED gconf-2.0 >= $GCONF_REQUIRED $STARTUP_NOTIFICATION_PACKAGE $RANDR_PACKAGE)
 
 dnl for gnome-about
 AM_PATH_PYTHON
@@ -186,7 +186,7 @@ GNOME_DOC_INIT
 
 dnl Language Support
 
-GETTEXT_PACKAGE=gnome-desktop-2.0
+GETTEXT_PACKAGE=gnome-desktop-3.0
 AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE",
 		   [The gettext translation domain])
 AC_SUBST(GETTEXT_PACKAGE)
@@ -221,8 +221,8 @@ gnome-about/headers/Makefile
 libgnome-desktop/Makefile
 libgnome-desktop/libgnome/Makefile
 libgnome-desktop/libgnomeui/Makefile
-libgnome-desktop/gnome-desktop-2.0.pc
-libgnome-desktop/gnome-desktop-2.0-uninstalled.pc
+libgnome-desktop/gnome-desktop-3.0.pc
+libgnome-desktop/gnome-desktop-3.0-uninstalled.pc
 docs/Makefile
 docs/reference/Makefile
 docs/reference/gnome-desktop/Makefile
diff --git a/libgnome-desktop/Makefile.am b/libgnome-desktop/Makefile.am
index 5b3fe90..936e618 100644
--- a/libgnome-desktop/Makefile.am
+++ b/libgnome-desktop/Makefile.am
@@ -8,11 +8,11 @@ INCLUDES =							\
 	$(XLIB_CFLAGS)						\
 	$(GNOME_DESKTOP_CFLAGS)
 
-lib_LTLIBRARIES = libgnome-desktop-2.la
+lib_LTLIBRARIES = libgnome-desktop-3.la
 
 noinst_PROGRAMS = test-ditem
 
-libgnome_desktop_2_la_SOURCES = \
+libgnome_desktop_3_la_SOURCES = \
 	gnome-desktop-item.c	\
 	gnome-desktop-utils.c	\
 	gnome-desktop-thumbnail.c \
@@ -28,11 +28,11 @@ libgnome_desktop_2_la_SOURCES = \
 	edid.h			\
 	private.h
 
-libgnome_desktop_2_la_LIBADD =	\
+libgnome_desktop_3_la_LIBADD =	\
 	$(XLIB_LIBS)		\
 	$(GNOME_DESKTOP_LIBS)
 
-libgnome_desktop_2_la_LDFLAGS = \
+libgnome_desktop_3_la_LDFLAGS = \
 	-version-info $(LT_VERSION) \
 	-no-undefined
 
@@ -40,12 +40,12 @@ test_ditem_SOURCES = \
 	test-ditem.c
 
 test_ditem_LDADD = \
-	libgnome-desktop-2.la		\
+	libgnome-desktop-3.la		\
 	$(XLIB_LIBS)			\
 	$(GNOME_DESKTOP_LIBS)
 
 pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = gnome-desktop-2.0.pc
+pkgconfig_DATA = gnome-desktop-3.0.pc
 
 pnpdata_DATA_dist = pnp.ids
 if USE_INTERNAL_PNP_IDS
@@ -57,8 +57,8 @@ check:
 	test -s $(top_srcdir)/libgnome-desktop/pnp.ids
 
 EXTRA_DIST = \
-	gnome-desktop-2.0.pc.in                \
-	gnome-desktop-2.0-uninstalled.pc.in    \
+	gnome-desktop-3.0.pc.in                \
+	gnome-desktop-3.0-uninstalled.pc.in    \
 	$(pnpdata_DATA_dist)
 
 MAINTAINERCLEANFILES = \
diff --git a/libgnome-desktop/gnome-desktop-2.0-uninstalled.pc.in b/libgnome-desktop/gnome-desktop-3.0-uninstalled.pc.in
similarity index 57%
rename from libgnome-desktop/gnome-desktop-2.0-uninstalled.pc.in
rename to libgnome-desktop/gnome-desktop-3.0-uninstalled.pc.in
index 0105cb8..085f055 100644
--- a/libgnome-desktop/gnome-desktop-2.0-uninstalled.pc.in
+++ b/libgnome-desktop/gnome-desktop-3.0-uninstalled.pc.in
@@ -3,9 +3,9 @@ exec_prefix= exec_prefix@
 libdir= libdir@
 includedir= includedir@
 
-Name: gnome-desktop-2.0
+Name: gnome-desktop-3.0
 Description: Utility library for loading .desktop files
-Requires: gtk+-2.0 libgnomeui-2.0 @STARTUP_NOTIFICATION_PACKAGE@
+Requires: gtk+-3.0 @STARTUP_NOTIFICATION_PACKAGE@
 Version: @VERSION@
-Libs: ${pc_top_builddir}/${pcfiledir}/libgnome-desktop-2.la
+Libs: ${pc_top_builddir}/${pcfiledir}/libgnome-desktop-3.la
 Cflags: -I${pc_top_builddir}/${pcfiledir}
diff --git a/libgnome-desktop/gnome-desktop-2.0.pc.in b/libgnome-desktop/gnome-desktop-3.0.pc.in
similarity index 50%
rename from libgnome-desktop/gnome-desktop-2.0.pc.in
rename to libgnome-desktop/gnome-desktop-3.0.pc.in
index 82e97af..e7d1c2a 100644
--- a/libgnome-desktop/gnome-desktop-2.0.pc.in
+++ b/libgnome-desktop/gnome-desktop-3.0.pc.in
@@ -3,9 +3,9 @@ exec_prefix= exec_prefix@
 libdir= libdir@
 includedir= includedir@
 
-Name: gnome-desktop-2.0
+Name: gnome-desktop-3.0
 Description: Utility library for loading .desktop files
-Requires: gtk+-2.0 @STARTUP_NOTIFICATION_PACKAGE@
+Requires: gtk+-3.0 @STARTUP_NOTIFICATION_PACKAGE@
 Version: @VERSION@
-Libs: -L${libdir} -lgnome-desktop-2
-Cflags: -I${includedir}/gnome-desktop-2.0
+Libs: -L${libdir} -lgnome-desktop-3
+Cflags: -I${includedir}/gnome-desktop-3.0
diff --git a/libgnome-desktop/libgnome/Makefile.am b/libgnome-desktop/libgnome/Makefile.am
index 537a045..c8f2fa7 100644
--- a/libgnome-desktop/libgnome/Makefile.am
+++ b/libgnome-desktop/libgnome/Makefile.am
@@ -1,4 +1,4 @@
-libgnome_desktopdir = $(includedir)/gnome-desktop-2.0/libgnome
+libgnome_desktopdir = $(includedir)/gnome-desktop-3.0/libgnome
 libgnome_desktop_HEADERS = \
 	gnome-desktop-utils.h \
 	gnome-desktop-item.h
diff --git a/libgnome-desktop/libgnomeui/Makefile.am b/libgnome-desktop/libgnomeui/Makefile.am
index 6e3c7c7..b7ebe58 100644
--- a/libgnome-desktop/libgnomeui/Makefile.am
+++ b/libgnome-desktop/libgnomeui/Makefile.am
@@ -1,4 +1,4 @@
-libgnomeui_desktopdir = $(includedir)/gnome-desktop-2.0/libgnomeui
+libgnomeui_desktopdir = $(includedir)/gnome-desktop-3.0/libgnomeui
 libgnomeui_desktop_HEADERS =	\
 	gnome-bg.h		\
 	gnome-bg-crossfade.h	\
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]