From 322884dde9c0131373989c1fc39d92a4ce7e87f9 Mon Sep 17 00:00:00 2001 From: Michael Terry Date: Sat, 19 Jun 2010 08:47:50 -0400 Subject: first pass at providing a gtk3 version --- configure.ac | 9 +++++++++ libindicator/Makefile.am | 19 ++++++++++++++++--- libindicator/indicator3.pc.in | 17 +++++++++++++++++ 3 files changed, 42 insertions(+), 3 deletions(-) create mode 100644 libindicator/indicator3.pc.in diff --git a/configure.ac b/configure.ac index 8ae0c74..7c706e9 100644 --- a/configure.ac +++ b/configure.ac @@ -29,6 +29,7 @@ m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])]) ############################## GTK_REQUIRED_VERSION=2.18 +GTK3_REQUIRED_VERSION=2.90 DBUS_REQUIRED_VERSION=0.76 GIO_UNIX_REQUIRED_VERSION=2.22 @@ -39,6 +40,13 @@ PKG_CHECK_MODULES(LIBINDICATOR, gtk+-2.0 >= $GTK_REQUIRED_VERSION AC_SUBST(LIBINDICATOR_CFLAGS) AC_SUBST(LIBINDICATOR_LIBS) +PKG_CHECK_MODULES(LIBINDICATOR3, gtk+-3.0 >= $GTK3_REQUIRED_VERSION + gio-unix-2.0 >= $GIO_UNIX_REQUIRED_VERSION + dbus-glib-1 >= $DBUS_REQUIRED_VERSION) + +AC_SUBST(LIBINDICATOR3_CFLAGS) +AC_SUBST(LIBINDICATOR3_LIBS) + ############################## # Custom Junk ############################## @@ -92,6 +100,7 @@ AC_OUTPUT([ Makefile libindicator/Makefile libindicator/indicator.pc +libindicator/indicator3.pc tests/Makefile tools/Makefile ]) diff --git a/libindicator/Makefile.am b/libindicator/Makefile.am index 983a6a5..e6f7390 100644 --- a/libindicator/Makefile.am +++ b/libindicator/Makefile.am @@ -2,11 +2,13 @@ BUILT_SOURCES = indicator-object-enum-types.h indicator-object-enum-types.c CLEANFILES = DISTCLEANFILES = EXTRA_DIST = \ - indicator.pc.in + indicator.pc.in \ + indicator3.pc.in include $(top_srcdir)/Makefile.am.marshal libindicatorincludedir=$(includedir)/libindicator-0.3/libindicator +libindicator3includedir=$(includedir)/libindicator-3.3/libindicator indicator_headers = \ indicator.h \ @@ -16,11 +18,15 @@ indicator_headers = \ indicator-service.h \ indicator-service-manager.h + libindicatorinclude_HEADERS = \ $(indicator_headers) +libindicator3include_HEADERS = \ + $(indicator3_headers) lib_LTLIBRARIES = \ - libindicator.la + libindicator.la \ + libindicator3.la libindicator_la_SOURCES = \ $(indicator_headers) \ @@ -33,16 +39,23 @@ libindicator_la_SOURCES = \ indicator-object-marshal.c \ indicator-service.c \ indicator-service-manager.c +libindicator3_la_SOURCES = $(libindicator_la_SOURCES) libindicator_la_CFLAGS = \ $(LIBINDICATOR_CFLAGS) \ -DG_LOG_DOMAIN=\"libindicator\" \ -Wall -Werror +libindicator3_la_CFLAGS = \ + $(LIBINDICATOR3_CFLAGS) \ + -DG_LOG_DOMAIN=\"libindicator\" \ + -Wall -Werror libindicator_la_LIBADD = \ $(LIBINDICATOR_LIBS) +libindicator3_la_LIBADD = \ + $(LIBINDICATOR3_LIBS) -pkgconfig_DATA = indicator.pc +pkgconfig_DATA = indicator.pc indicator3.pc pkgconfigdir = $(libdir)/pkgconfig glib_marshal_list = indicator-object-marshal.list diff --git a/libindicator/indicator3.pc.in b/libindicator/indicator3.pc.in new file mode 100644 index 0000000..47b3461 --- /dev/null +++ b/libindicator/indicator3.pc.in @@ -0,0 +1,17 @@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +libdir=@libdir@ +bindir=@bindir@ +includedir=@includedir@ + +indicatordir=${libdir}/indicators/3/ +iconsdir=@datarootdir@/@PACKAGE@/icons/ + +Cflags: -I${includedir}/libindicator-3.3 +Requires: gtk+-3.0 +Libs: -lindicator3 + +Name: libindicator3 +Description: libindicator. +Version: @VERSION@ + -- cgit v1.2.3 From 923a1d5b25bbc33513984d413acdad9a5d446ab9 Mon Sep 17 00:00:00 2001 From: Michael Terry Date: Sat, 19 Jun 2010 09:32:03 -0400 Subject: don't use 3.3 version, rather use indicator3 --- libindicator/Makefile.am | 4 ++-- libindicator/indicator3.pc.in | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libindicator/Makefile.am b/libindicator/Makefile.am index e6f7390..172e2b2 100644 --- a/libindicator/Makefile.am +++ b/libindicator/Makefile.am @@ -8,7 +8,7 @@ EXTRA_DIST = \ include $(top_srcdir)/Makefile.am.marshal libindicatorincludedir=$(includedir)/libindicator-0.3/libindicator -libindicator3includedir=$(includedir)/libindicator-3.3/libindicator +libindicator3includedir=$(includedir)/libindicator3-0.3/libindicator indicator_headers = \ indicator.h \ @@ -22,7 +22,7 @@ indicator_headers = \ libindicatorinclude_HEADERS = \ $(indicator_headers) libindicator3include_HEADERS = \ - $(indicator3_headers) + $(indicator_headers) lib_LTLIBRARIES = \ libindicator.la \ diff --git a/libindicator/indicator3.pc.in b/libindicator/indicator3.pc.in index 47b3461..ba7098c 100644 --- a/libindicator/indicator3.pc.in +++ b/libindicator/indicator3.pc.in @@ -7,11 +7,11 @@ includedir=@includedir@ indicatordir=${libdir}/indicators/3/ iconsdir=@datarootdir@/@PACKAGE@/icons/ -Cflags: -I${includedir}/libindicator-3.3 +Cflags: -I${includedir}/libindicator3-0.3 Requires: gtk+-3.0 Libs: -lindicator3 Name: libindicator3 -Description: libindicator. +Description: libindicator3. Version: @VERSION@ -- cgit v1.2.3 From ecc6acd2a576fcc11d51ded532f570fb29ab475e Mon Sep 17 00:00:00 2001 From: Michael Terry Date: Wed, 6 Oct 2010 10:58:49 -0400 Subject: instead of always building gtk2 and gtk3, add a --with-gtk= flag to configure to specify which to build with --- configure.ac | 38 ++++++++++++++++++++++++-------------- libindicator/Makefile.am | 40 +++++++++++++++++++++------------------- tests/Makefile.am | 18 ++++++++++++------ tools/Makefile.am | 7 ++++++- 4 files changed, 63 insertions(+), 40 deletions(-) diff --git a/configure.ac b/configure.ac index 7c706e9..5f4d3c9 100644 --- a/configure.ac +++ b/configure.ac @@ -29,23 +29,32 @@ m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])]) ############################## GTK_REQUIRED_VERSION=2.18 -GTK3_REQUIRED_VERSION=2.90 +GTK3_REQUIRED_VERSION=2.91 DBUS_REQUIRED_VERSION=0.76 GIO_UNIX_REQUIRED_VERSION=2.22 -PKG_CHECK_MODULES(LIBINDICATOR, gtk+-2.0 >= $GTK_REQUIRED_VERSION - gio-unix-2.0 >= $GIO_UNIX_REQUIRED_VERSION - dbus-glib-1 >= $DBUS_REQUIRED_VERSION) - -AC_SUBST(LIBINDICATOR_CFLAGS) -AC_SUBST(LIBINDICATOR_LIBS) - -PKG_CHECK_MODULES(LIBINDICATOR3, gtk+-3.0 >= $GTK3_REQUIRED_VERSION - gio-unix-2.0 >= $GIO_UNIX_REQUIRED_VERSION - dbus-glib-1 >= $DBUS_REQUIRED_VERSION) - -AC_SUBST(LIBINDICATOR3_CFLAGS) -AC_SUBST(LIBINDICATOR3_LIBS) +AC_ARG_WITH([gtk], + [AS_HELP_STRING([--with-gtk], + [Which version of gtk to use @<:@default=2@:>@])], + [], + [with_gtk=2]) +AS_IF([test "x$with_gtk" = x3], + [PKG_CHECK_MODULES(LIBINDICATOR, gtk+-3.0 >= $GTK3_REQUIRED_VERSION + gio-unix-2.0 >= $GIO_UNIX_REQUIRED_VERSION + dbus-glib-1 >= $DBUS_REQUIRED_VERSION) + AC_SUBST(LIBINDICATOR_CFLAGS) + AC_SUBST(LIBINDICATOR_LIBS) + ], + [test "x$with_gtk" = x2], + [PKG_CHECK_MODULES(LIBINDICATOR, gtk+-2.0 >= $GTK_REQUIRED_VERSION + gio-unix-2.0 >= $GIO_UNIX_REQUIRED_VERSION + dbus-glib-1 >= $DBUS_REQUIRED_VERSION) + AC_SUBST(LIBINDICATOR_CFLAGS) + AC_SUBST(LIBINDICATOR_LIBS) + ], + [AC_MSG_FAILURE([Value for --with-gtk was neither 2 nor 3])] +) +AM_CONDITIONAL(USE_GTK3, [test "x$with_gtk" = x3]) ############################## # Custom Junk @@ -114,4 +123,5 @@ AC_MSG_NOTICE([ Libindicator Configuration: Prefix: $prefix + GTK+ Version: $with_gtk ]) diff --git a/libindicator/Makefile.am b/libindicator/Makefile.am index 172e2b2..4932f07 100644 --- a/libindicator/Makefile.am +++ b/libindicator/Makefile.am @@ -1,14 +1,20 @@ +if USE_GTK3 +VER=3 +lib_LTLIBRARIES = libindicator3.la +else +VER= +lib_LTLIBRARIES = libindicator.la +endif + BUILT_SOURCES = indicator-object-enum-types.h indicator-object-enum-types.c CLEANFILES = DISTCLEANFILES = EXTRA_DIST = \ - indicator.pc.in \ - indicator3.pc.in + indicator$(VER).pc.in include $(top_srcdir)/Makefile.am.marshal -libindicatorincludedir=$(includedir)/libindicator-0.3/libindicator -libindicator3includedir=$(includedir)/libindicator3-0.3/libindicator +libindicatorincludedir=$(includedir)/libindicator$(VER)-0.3/libindicator indicator_headers = \ indicator.h \ @@ -18,15 +24,8 @@ indicator_headers = \ indicator-service.h \ indicator-service-manager.h - libindicatorinclude_HEADERS = \ $(indicator_headers) -libindicator3include_HEADERS = \ - $(indicator_headers) - -lib_LTLIBRARIES = \ - libindicator.la \ - libindicator3.la libindicator_la_SOURCES = \ $(indicator_headers) \ @@ -39,23 +38,26 @@ libindicator_la_SOURCES = \ indicator-object-marshal.c \ indicator-service.c \ indicator-service-manager.c -libindicator3_la_SOURCES = $(libindicator_la_SOURCES) libindicator_la_CFLAGS = \ $(LIBINDICATOR_CFLAGS) \ -DG_LOG_DOMAIN=\"libindicator\" \ -Wall -Werror -libindicator3_la_CFLAGS = \ - $(LIBINDICATOR3_CFLAGS) \ - -DG_LOG_DOMAIN=\"libindicator\" \ - -Wall -Werror libindicator_la_LIBADD = \ $(LIBINDICATOR_LIBS) -libindicator3_la_LIBADD = \ - $(LIBINDICATOR3_LIBS) -pkgconfig_DATA = indicator.pc indicator3.pc +# We duplicate these here because Automake won't let us use $(VER) on the left hand side. +# Since we carefully use $(VER) in the right hand side above, we can assign the same values. +# Only one version of the library is every compiled at the same time, so it is safe to reuse +# the right hand sides like this. +libindicator3includedir = $(libindicatorincludedir) +libindicator3include_HEADERS = $(indicator_headers) +libindicator3_la_SOURCES = $(libindicator_la_SOURCES) +libindicator3_la_CFLAGS = $(libindicator_la_CFLAGS) +libindicator3_la_LIBADD = $(libindicator_la_LIBADD) + +pkgconfig_DATA = indicator$(VER).pc pkgconfigdir = $(libdir)/pkgconfig glib_marshal_list = indicator-object-marshal.list diff --git a/tests/Makefile.am b/tests/Makefile.am index 13fef2d..d6a1048 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -1,3 +1,9 @@ +if USE_GTK3 +INDICATOR_LIB = -lindicator3 +else +INDICATOR_LIB = -lindicator +endif + TESTS = DISTCLEANFILES = @@ -31,7 +37,7 @@ test_loader_CFLAGS = \ test_loader_LDADD = \ $(LIBINDICATOR_LIBS) \ -L$(top_builddir)/libindicator/.libs \ - -lindicator + $(INDICATOR_LIB) ############################# # Test Desktop Shortcuts @@ -51,7 +57,7 @@ test_desktop_shortcuts_CFLAGS = \ test_desktop_shortcuts_LDADD = \ $(LIBINDICATOR_LIBS) \ -L$(top_builddir)/libindicator/.libs \ - -lindicator + $(INDICATOR_LIB) DS_XML_REPORT = desktop-shortcuts-check-results.xml DS_HTML_REPORT = desktop-shortcuts-check-results.html @@ -83,7 +89,7 @@ libdummy_indicator_blank_la_CFLAGS = \ libdummy_indicator_blank_la_LIBADD = \ $(LIBINDICATOR_LIBS) \ -L$(top_builddir)/libindicator/.libs \ - -lindicator + $(INDICATOR_LIB) libdummy_indicator_blank_la_LDFLAGS = \ -module \ @@ -103,7 +109,7 @@ libdummy_indicator_null_la_CFLAGS = \ libdummy_indicator_null_la_LIBADD = \ $(LIBINDICATOR_LIBS) \ -L$(top_builddir)/libindicator/.libs \ - -lindicator + $(INDICATOR_LIB) libdummy_indicator_null_la_LDFLAGS = \ -module \ @@ -123,7 +129,7 @@ libdummy_indicator_signaler_la_CFLAGS = \ libdummy_indicator_signaler_la_LIBADD = \ $(LIBINDICATOR_LIBS) \ -L$(top_builddir)/libindicator/.libs \ - -lindicator + $(INDICATOR_LIB) libdummy_indicator_signaler_la_LDFLAGS = \ -module \ @@ -143,7 +149,7 @@ libdummy_indicator_simple_la_CFLAGS = \ libdummy_indicator_simple_la_LIBADD = \ $(LIBINDICATOR_LIBS) \ -L$(top_builddir)/libindicator/.libs \ - -lindicator + $(INDICATOR_LIB) libdummy_indicator_simple_la_LDFLAGS = \ -module \ diff --git a/tools/Makefile.am b/tools/Makefile.am index 5e5ef8d..d2964f9 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -1,3 +1,8 @@ +if USE_GTK3 +INDICATOR_LIB = -lindicator3 +else +INDICATOR_LIB = -lindicator +endif libexec_PROGRAMS = \ indicator-loader @@ -17,5 +22,5 @@ indicator_loader_CFLAGS = \ indicator_loader_LDADD = \ $(LIBINDICATOR_LIBS) \ -L$(top_builddir)/libindicator/.libs \ - -lindicator + $(INDICATOR_LIB) -- cgit v1.2.3 From 40d11e1691f0a91815c746899b79be8c8e50bf9a Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 11 Nov 2010 09:26:24 -0600 Subject: Updating ignore for the GTK3 stuff --- .bzrignore | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/.bzrignore b/.bzrignore index c3c6afd..6599569 100644 --- a/.bzrignore +++ b/.bzrignore @@ -156,3 +156,16 @@ tests/service-version-multiwatch-manager tests/service-version-multiwatch-tester tests/service-version-multiwatch-service tests/service-version-multiwatch-manager-impolite +libindicator/indicator-object-enum-types.c +libindicator/indicator-object-enum-types.h +libindicator/indicator3.pc +libindicator/libindicator3.la +libindicator/libindicator3_la-indicator-desktop-shortcuts.lo +libindicator/libindicator3_la-indicator-image-helper.lo +libindicator/libindicator3_la-indicator-object-enum-types.lo +libindicator/libindicator3_la-indicator-object-marshal.lo +libindicator/libindicator3_la-indicator-object.lo +libindicator/libindicator3_la-indicator-service-manager.lo +libindicator/libindicator3_la-indicator-service.lo +libindicator/libindicator_la-indicator-object-enum-types.lo +libindicator/s-enum-types-h -- cgit v1.2.3 From 5c848a14979bf12357c88a7e90422d1deb045ed5 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 11 Nov 2010 09:33:27 -0600 Subject: Putting the GTK3 indicators in a different directory. --- libindicator/indicator3.pc.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libindicator/indicator3.pc.in b/libindicator/indicator3.pc.in index ba7098c..74b93c5 100644 --- a/libindicator/indicator3.pc.in +++ b/libindicator/indicator3.pc.in @@ -4,7 +4,7 @@ libdir=@libdir@ bindir=@bindir@ includedir=@includedir@ -indicatordir=${libdir}/indicators/3/ +indicatordir=${libdir}/indicators3/1/ iconsdir=@datarootdir@/@PACKAGE@/icons/ Cflags: -I${includedir}/libindicator3-0.3 -- cgit v1.2.3 From 75672d53ab18c2e057927e610ea22890fbb102a2 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 11 Nov 2010 09:38:43 -0600 Subject: Checking for deprecations and making sure we check on distcheck --- Makefile.am | 2 ++ configure.ac | 9 +++++++++ 2 files changed, 11 insertions(+) diff --git a/Makefile.am b/Makefile.am index f290d63..c955c6a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -4,6 +4,8 @@ SUBDIRS = \ tests \ tools +DISTCHECK_CONFIGURE_FLAGS = --disable-deprecations + DISTCLEANFILES = \ libindicator-*.tar.gz diff --git a/configure.ac b/configure.ac index 86eec72..8b4a709 100644 --- a/configure.ac +++ b/configure.ac @@ -24,6 +24,15 @@ AC_CONFIG_MACRO_DIR([m4]) m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])]) +AC_ARG_ENABLE([deprecations], + [AS_HELP_STRING([--enable-deprecations], + [allow deprecated API usage @<:@default=yes@:>@])], + [], + [enable_deprecations=yes]) +AS_IF([test "x$enable_deprecations" = xno], + [CFLAGS="$CFLAGS -DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -DGSEAL_ENABLE -DGTK_DISABLE_SINGLE_INCLUDES"] +) + ############################## # Dependencies ############################## -- cgit v1.2.3 From 10d7e22266bf5591f1544d97db00ea631fbc57d5 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 11 Nov 2010 09:38:56 -0600 Subject: Making sure to get both pc files in the tarball --- libindicator/Makefile.am | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libindicator/Makefile.am b/libindicator/Makefile.am index 94cf3e0..39cb2b7 100644 --- a/libindicator/Makefile.am +++ b/libindicator/Makefile.am @@ -10,7 +10,8 @@ BUILT_SOURCES = indicator-object-enum-types.h indicator-object-enum-types.c CLEANFILES = DISTCLEANFILES = EXTRA_DIST = \ - indicator$(VER).pc.in + indicator3.pc.in \ + indicator.pc.in include $(top_srcdir)/Makefile.am.marshal -- cgit v1.2.3 From db16c1fe7624051fb92be1bf95549e6460d8eced Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 11 Nov 2010 10:20:24 -0600 Subject: Fixing the ignore file tarball matching --- .bzrignore | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.bzrignore b/.bzrignore index 6599569..1c213cf 100644 --- a/.bzrignore +++ b/.bzrignore @@ -115,8 +115,8 @@ tests/libdummy-indicator-simple.la tests/libdummy_indicator_simple_la-dummy-indicator-simple.lo tests/libdummy-indicator-blank.la tests/libdummy_indicator_blank_la-dummy-indicator-blank.lo -libindicator-[0-9].[0-9].[0-9].tar.gz -libindicator-[0-9].[0-9].[0-9].tar.gz.asc +libindicator-[0-9]*.[0-9]*.[0-9]*.tar.gz +libindicator-[0-9]*.[0-9]*.[0-9]*.tar.gz.asc libindicator/libindicator_la-indicator-instance.lo tests/libdummy-indicator-signaler.la tests/libdummy_indicator_signaler_la-dummy-indicator-signaler.lo -- cgit v1.2.3 From 7d8375c7694f91fb05f72cf175a0a0219ba19bb1 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 11 Nov 2010 14:39:02 -0600 Subject: 0.3.15 --- configure.ac | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 8b4a709..365ebea 100644 --- a/configure.ac +++ b/configure.ac @@ -1,10 +1,10 @@ -AC_INIT(libindicator, 0.3.14, ted@canonical.com) +AC_INIT(libindicator, 0.3.15, ted@canonical.com) AC_PREREQ(2.53) AM_CONFIG_HEADER(config.h) -AM_INIT_AUTOMAKE(libindicator, 0.3.14) +AM_INIT_AUTOMAKE(libindicator, 0.3.15) AM_MAINTAINER_MODE m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES]) -- cgit v1.2.3