This is an automated email from the git hooks/post-receive script. juha pushed a commit to branch master in repository apps/orage.
commit df687eb2738bea3cbbd9765f3fc1fc563408a869 Author: Juha Kautto <j...@xfce.org> Date: Wed Apr 8 12:13:49 2015 +0300 4.11.2.22 fix bug 8719 build the panel plugin as module Big change from Landry Breuil to make Orage panel plugin configuration and locations similar to other plugins. --- configure.in.in | 7 ++- panel-plugin/Makefile.am | 60 +++++++++----------- panel-plugin/xfce4-orageclock-plugin.c | 4 +- ...op.in.in => xfce4-orageclock-plugin.desktop.in} | 3 +- po/POTFILES.in | 2 +- 5 files changed, 36 insertions(+), 40 deletions(-) diff --git a/configure.in.in b/configure.in.in index e8b2f4b..d2ea47d 100644 --- a/configure.in.in +++ b/configure.in.in @@ -9,7 +9,7 @@ dnl Written for Xfce by Juha Kautto <j...@xfce.org> dnl dnl Version information -m4_define([orage_version], [4.11.2.21-git]) +m4_define([orage_version], [4.11.2.22-git]) m4_define([gtk_minimum_version], [2.14.0]) m4_define([xfce_minimum_version], [4.8.0]) @@ -49,11 +49,14 @@ dnl Check for basic programs AC_PROG_CC() AC_PROG_INSTALL() AC_PROG_INTLTOOL([intltool_minimum_version], [no-xml]) -AC_PROG_LIBTOOL() AC_PROG_YACC() AC_PROG_LN_S() AM_PROG_LEX() AM_PROG_CC_C_O() + +dnl Initialize libtool +LT_PREREQ([2.2.6]) +LT_INIT([disable-static]) dnl Check for standard header files AC_HEADER_STDC() diff --git a/panel-plugin/Makefile.am b/panel-plugin/Makefile.am index cb20d72..6108445 100644 --- a/panel-plugin/Makefile.am +++ b/panel-plugin/Makefile.am @@ -1,57 +1,49 @@ if HAVE_LIBXFCE4PANEL -plugin_PROGRAMS = xfce4-orageclock-plugin +plugin_LTLIBRARIES = orageclock.la endif -plugindir = $(libexecdir)/xfce4/panel-plugins +plugindir = $(libdir)/xfce4/panel/plugins -xfce4_orageclock_plugin_CFLAGS = \ +orageclock_la_CFLAGS = \ -DPACKAGE_DATA_DIR=\"$(datadir)\" \ -DPACKAGE_LOCALE_DIR=\"$(localedir)\" \ @LIBXFCE4PANEL_CFLAGS@ -xfce4_orageclock_plugin_LDFLAGS = \ +orageclock_la_LDFLAGS = \ + -avoid-version \ + -module \ + -no-undefined \ + -export-symbols-regex '^xfce_panel_module_(preinit|init|construct)' \ + $(PLATFORM_LDFLAGS) + +orageclock_la_LIBADD = \ @LIBXFCE4PANEL_LIBS@ \ -lX11 -xfce4_orageclock_plugin_SOURCES = \ - oc_config.c \ - timezone_selection.c \ - timezone_selection.h \ - ../src/tz_zoneinfo_read.c \ - ../src/tz_zoneinfo_read.h \ - xfce4-orageclock-plugin.c \ - xfce4-orageclock-plugin.h \ - ../src/functions.c \ - ../src/functions.h +orageclock_la_SOURCES = \ + oc_config.c \ + timezone_selection.c \ + timezone_selection.h \ + ../src/tz_zoneinfo_read.c \ + ../src/tz_zoneinfo_read.h \ + xfce4-orageclock-plugin.c \ + xfce4-orageclock-plugin.h \ + ../src/functions.c \ + ../src/functions.h if HAVE_CYGWIN -xfce4_orageclock_plugin_LDFLAGS += \ +orageclock_la_LDFLAGS += \ -no-undefined endif # .desktop file # -# Some automake trickery here. Because we cannot use $(libexecdir) in the -# automake stage, we'll use sed to get the full path into the .desktop file. -# We also need to let intltool merge the translated fields, so we add an -# additional level of indirection: a <name>.desktop.in.in file. -# -desktop_in_in_files = xfce4-orageclock-plugin.desktop.in.in -desktop_in_files = $(desktop_in_in_files:.desktop.in.in=.desktop.in) +desktop_in_files = xfce4-orageclock-plugin.desktop.in -desktopdir = $(datadir)/xfce4/panel-plugins +desktopdir = $(datadir)/xfce4/panel/plugins desktop_DATA = $(desktop_in_files:.desktop.in=.desktop) @INTLTOOL_DESKTOP_RULE@ -EXTRA_DIST = \ - $(desktop_in_in_files) - -DISTCLEANFILES = \ - $(desktop_DATA) $(desktop_in_files) - -# get full path into .desktop file -#%.desktop.in: %.desktop.in.in -xfce4-orageclock-plugin.desktop.in: xfce4-orageclock-plugin.desktop.in.in - sed -e "s^@PLUGIN_PATH@^$(libexecdir)/xfce4/panel-plugins^" \ - $< > $@ +EXTRA_DIST = $(desktop_in_files) +DISTCLEANFILES = $(desktop_DATA) diff --git a/panel-plugin/xfce4-orageclock-plugin.c b/panel-plugin/xfce4-orageclock-plugin.c index 96573c9..ae3aa8b 100644 --- a/panel-plugin/xfce4-orageclock-plugin.c +++ b/panel-plugin/xfce4-orageclock-plugin.c @@ -1,7 +1,7 @@ /* vim: set expandtab ts=4 sw=4: */ /* * - * Copyright © 2006-2011 Juha Kautto <j...@xfce.org> + * Copyright © 2006-2015 Juha Kautto <j...@xfce.org> * * it under the terms of the GNU Library General Public License as published * by the Free Software Foundation; either version 2 of the License, or @@ -814,5 +814,5 @@ static void oc_construct(XfcePanelPlugin *plugin) /* Register with the panel */ -XFCE_PANEL_PLUGIN_REGISTER_EXTERNAL(oc_construct); +XFCE_PANEL_PLUGIN_REGISTER(oc_construct); diff --git a/panel-plugin/xfce4-orageclock-plugin.desktop.in.in b/panel-plugin/xfce4-orageclock-plugin.desktop.in similarity index 68% rename from panel-plugin/xfce4-orageclock-plugin.desktop.in.in rename to panel-plugin/xfce4-orageclock-plugin.desktop.in index 7220138..cc9aa4d 100644 --- a/panel-plugin/xfce4-orageclock-plugin.desktop.in.in +++ b/panel-plugin/xfce4-orageclock-plugin.desktop.in @@ -3,5 +3,6 @@ Type=X-XFCE-PanelPlugin _Name=Orage Panel Clock _Comment=Show time and date? Icon=xfce-schedule -X-XFCE-Exec=@PLUGIN_PATH@/xfce4-orageclock-plugin +X-XFCE-Module=orageclock +X-XFCE-Internal=FALSE diff --git a/po/POTFILES.in b/po/POTFILES.in index eec11c0..240f7f3 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -29,6 +29,6 @@ src/tray_icon.c src/tz_zoneinfo_read.c # files added by intltool-prepare. -panel-plugin/xfce4-orageclock-plugin.desktop.in.in +panel-plugin/xfce4-orageclock-plugin.desktop.in plugin/xfce-xfcalendar-settings.desktop.in xfcalendar.desktop.in -- To stop receiving notification emails like this one, please contact the administrator of this repository. _______________________________________________ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits