finally merging the cmake branch into default
--- a/.hgignore Fri Jan 08 17:24:43 2010 -0600
+++ b/.hgignore Mon Dec 20 00:17:04 2010 -0600
@@ -1,45 +1,35 @@
.+/doc/gflib(-.+)?/(ht|x)ml$
.+/doc/gflib(-.+)?/gflib(-.+)?-(decl(-list)?|undeclared|undocumented|unused)\.txt$
.+/doc/gflib(-.+)?/gflib(-.+)?\.(args|hierarchy|interfaces|prerequisites|signals)$
@@ -48,12 +38,11 @@
^docs/specifications/.+/(html|spec\.stamp)$
-config.(guess|log|status|sub|h(\.in)?)$ ^docs/specification/dir\.stamp$
^docs/specification/xml/xml\.stamp$
^gflib(.*)/gflib(.*)-(.+)/
-^gflib/gflib/gflib-(genheader|queryplugins)$+^gflib/gflib/gflib-(genheader|query-plugins)$ ^gflib/gflib/gf_enum\.[ch]$
^gflib/tests/(genobjects|testlog)$
^gflib-eggdbus/gflib-eggdbus/docbook-.+\.xml$
@@ -65,5 +54,5 @@
guifications-daemon/guifications-daemon.service$
guifications-daemon/src/guifications-daemon$
guifications-gtk/src/guifications-gtk$
-intltool-(extract|merge|update)(\.in)?$ gflib-sharp/sources/(gf3|gflib(-sharp-sources.xml|\.mtn)?)$
--- a/docs/specification/Makefile Fri Jan 08 17:24:43 2010 -0600
+++ b/docs/specification/Makefile Mon Dec 20 00:17:04 2010 -0600
@@ -19,7 +19,9 @@
graphs/abstract_gf3_complex.digraph \
graphs/abstract_growl.digraph \
graphs/abstract_libnotify.digraph \
- graphs/communication_gf3_dbus_example.digraph+ graphs/communication_gf3_dbus_example.digraph \ + graphs/project_hierarchy.digraph \ + graphs/dependencies_gflib.digraph GRAPHS=$(DIGRAPHS:%.digraph=%.png)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/docs/specification/graphs/dependency_gflib.digraph Mon Dec 20 00:17:04 2010 -0600
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?> + <objects color="powderblue" shape="box" style="filled,rounded"> + <object name="t_gflib" label="gflib"/> + <objects color="lightpink" shape="box" style="filled,rounded"> + <object name="d_glib" label="glib2.0 (>=2.16.0)"/> + <object name="d_gmodule" label="gmodule2.0 (>=2.16.0)"/> + <object name="d_gobject" label="gobject2.0 (>=2.16.0)"/> + <object name="d_gobdoc" label="gobdoc"/> + <object name="d_intltool" label="intltool"/> + <relation start="t_gflib" end="d_glib"/> + <relation start="t_gflib" end="d_gmodule"/> + <relation start="t_gflib" end="d_gobject"/> + <relation start="t_gflib" end="d_gobdoc"/> + <relation start="t_gflib" end="d_intltool"/> --- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/docs/specification/graphs/project_hierarchy.digraph Mon Dec 20 00:17:04 2010 -0600
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="utf-8"?> + <objects color="powderblue" shape="box" style="filled,rounded"> + <object name="l_gflib" label="gflib"/> + <object name="l_gflib_ui" label="gflib-ui"/> + <object name="l_gflib_gtk" label="gflib-gtk"/> + <objects color="lightpink" shape="box" style="filled,rounded"> + <object name="b_gflib_java" label="gflib-java"/> + <object name="b_gflibmm" label="gflibmm"/> + <object name="b_gflib_sharp" label="gflib-sharp"/> + <object name="b_python_gflib" label="python-gflib"/> + <object name="b_gflib_xpcom" label="gflib-xpcom"/> + <objects color="palegreen" shape="box" style="filled,rounded"> + <object name="a_guifications_gtk" label="guifications-gtk"/> + <object name="a_guifications_daemon" label="guifications-daemon"/> + <objects color="lightyellow" shape="box" style="filled,rounded"> + <object name="c_gflib_dbus" label="gflib-dbus"/> + <object name="c_gflib_xmlrpc" label="gflib-xmlrpc"/> + <object name="c_gflib_growl" label="gflib-growl"/> + <object name="c_gflib_unix" label="gflib-unix"/> + <object name="c_gflib_notify" label="gflib-notify"/> + <!-- daemon plugins --> + <objects color="lightgray" shape="box" style="filled,rounded"> + <object name="d_guifications_daemon_web" label="guifications-daemon-web"/> + <object name="d_guifications_daemon_mpris" label="guifications-daemon-mpris"/> + <objects color="cornflowerblue" shape="box" style="filled,rounded"> + <object name="p_purple_guifications" label="purple-guifications"/> + <object name="p_mozilla_guifications" label="mozilla-guifications"/> + <object name="p_rhythmbox_guifications" label="rhythmbox-guifications"/> + <relation start="l_gflib_ui" end="l_gflib"/> + <relation start="l_gflib_gtk" end="l_gflib_ui"/> + <relation start="b_gflib_java" end="l_gflib"/> + <relation start="b_gflibmm" end="l_gflib"/> + <relation start="b_gflib_sharp" end="l_gflib"/> + <relation start="b_python_gflib" end="l_gflib"/> + <relation start="b_gflib_xpcom" end="l_gflib"/> + <relation start="a_guifications_gtk" end="l_gflib_gtk"/> + <relation start="a_guifications_daemon" end="l_gflib"/> + <relation start="c_gflib_dbus" end="l_gflib"/> + <relation start="c_gflib_xmlrpc" end="l_gflib"/> + <relation start="c_gflib_growl" end="l_gflib"/> + <relation start="c_gflib_unix" end="l_gflib"/> + <relation start="c_gflib_notify" end="l_gflib"/> + <!-- daemon plugins --> + <relation start="d_guifications_daemon_web" end="a_guifications_daemon"/> + <relation start="d_guifications_daemon_mpris" end="a_guifications_daemon"/> + <relation start="p_purple_guifications" end="l_gflib"/> + <relation start="p_mozilla_guifications" end="b_gflib_xpcom"/> + <relation start="p_rhythmbox_guifications" end="b_python_gflib"/> --- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/gflib-gtk/CMakeLists.txt Mon Dec 20 00:17:04 2010 -0600
@@ -0,0 +1,25 @@
+cmake_minimum_required(VERSION 2.8) +GFLIB_LIBRARY_PROJECT(gflib-gtk 0 0 1 dev) +pkg_check_modules(GTK REQUIRED gtk+-2.0>=2.16.0) +pkg_check_modules(GFLIB_UI REQUIRED gflib-ui) + ${GFLIB_UI_INCLUDE_DIRS} + ${GFLIB_UI_LIBRARY_DIRS} +add_subdirectory(gflib-gtk) --- a/gflib-gtk/Makefile.am Fri Jan 08 17:24:43 2010 -0600
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,23 +0,0 @@
-SUBDIRS = gflib-gtk doc po tests-DISTCHECK_CONFIGURE_FLAGS=--enable-gtk-doc-pcdata_DATA=gflib-gtk.pc-pcdatadir = $(libdir)/pkgconfig-libtool: $(LIBTOOL_DEPS)- $(SHELL) ./config.status --recheck--- a/gflib-gtk/autogen.sh Fri Jan 08 17:24:43 2010 -0600
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,30 +0,0 @@
-# Guifications - The end-all, be-all notification framework-# Copyright (C) 2003-2009 Gary Kramlich <grim@reaperworld.com>-# This program is free software: you can redistribute it and/or modify-# it under the terms of the GNU General Public License as published by-# the Free Software Foundation, either version 3 of the License, or-# (at your option) any later version.-# This program is distributed in the hope that it will be useful,-# but WITHOUT ANY WARRANTY; without even the implied warranty of-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the-# GNU General Public License for more details.-# You should have received a copy of the GNU General Public License-# along with this program. If not, see <http://www.gnu.org/licenses/>.-which gflib-autogen.sh || {- echo "You need to install gflib to run autogen"-add_default_library_commands--- a/gflib-gtk/configure.ac Fri Jan 08 17:24:43 2010 -0600
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,212 +0,0 @@
-dnl Process this file with autoconf to create configure.-dnl ################################################################-dnl # Initialize autoconf-dnl ################################################################-AC_INIT(gflib-gtk, 0.0.1dev, guifications-devel@lists.guifications.org)-AC_CONFIG_SRCDIR(config.h.in)-AC_COPYRIGHT([Copyright 2005-2009 Gary Kramlich])-dnl ################################################################-dnl # Version information-dnl ################################################################-GFLIB_GTK_MAJOR_VERSION=0-GFLIB_GTK_MINOR_VERSION=0-GFLIB_GTK_MICRO_VERSION=1-GFLIB_GTK_DEVEL_VERSION=0-GFLIB_GTK_VERSION=$GFLIB_GTK_MAJOR_VERSION.$GFLIB_GTK_MINOR_VERSION.$GFLIB_GTK_MICRO_VERSION-if test "x$GFLIB_GTK_DEVEL_VERSION" != "x0"; then- if test "x$GFLIB_GTK_MICRO_VERSION" = "x0"; then- GFLIB_GTK_MICRO_VERSION=$GFLIB_GTK_DEVEL_VERSION- GFLIB_GTK_VERSION=$GFLIB_GTK_MAJOR_VERSION.$GFLIB_GTK_MINOR_VERSION.$GFLIB_GTK_MICRO_VERSION- GFLIB_GTK_VERSION=$GFLIB_GTK_VERSION.$GFLIB_GTK_DEVEL_VERSION-AC_DEFINE_UNQUOTED(GFLIB_GTK_MAJOR_VERSION, $GFLIB_GTK_MAJOR_VERSION, [gflib-gtk major version.])-AC_DEFINE_UNQUOTED(GFLIB_GTK_MINOR_VERSION, $GFLIB_GTK_MINOR_VERSION, [gflib-gtk minor version.])-AC_DEFINE_UNQUOTED(GFLIB_GTK_MICRO_VERSION, $GFLIB_GTK_MICRO_VERSION, [gflib-gtk micro version.])-AC_DEFINE_UNQUOTED(GFLIB_GTK_VERSION, $GFLIB_GTK_VERSION, [gflib-gtk version])-AC_DEFINE_UNQUOTED(GFLIB_GTK_VERSION_S, "$GFLIB_GTK_VERSION", [gflib-gtk version string])-dnl ################################################################-dnl # libtool versioning-dnl ################################################################-dnl # +1 : 0 : +1 == new interface that does not break old one.-dnl # +1 : 0 : 0 == removed an interface. Breaks old apps.-dnl # ? : +1 : ? == internal changes that doesn't break anything.-dnl # CURRENT : REVISION : AGE-LT_RELEASE=$GFLIB_GTK_MAJOR_VERSION.$GFLIB_GTK_MINOR_VERSION.$GFLIB_GTK_MICRO_VERSION-dnl ################################################################-dnl # Initialize automake-dnl ################################################################-AM_INIT_AUTOMAKE([gnu dist-bzip2])-dnl ################################################################-dnl # Configuration file-dnl ################################################################-AM_CONFIG_HEADER(config.h)-dnl # Stash configure args-AC_DEFINE_UNQUOTED(CONFIG_ARGS, "$ac_configure_args", [configure arguments])-dnl #######################################################################-dnl # Make sure we have pkg-config-dnl #######################################################################-dnl #######################################################################-dnl #######################################################################-LIBTOOL="$LIBTOOL --silent"-dnl #######################################################################-dnl #######################################################################-AH_TOP([ /* our header */-dnl #######################################################################-dnl #######################################################################-GETTEXT_PACKAGE=gflib-gtk-AC_SUBST(GETTEXT_PACKAGE)-AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, ["$GETTEXT_PACKAGE"], [Define the gettext package to be used])-dnl #######################################################################-dnl # Look for the C compiler-dnl #######################################################################- AC_HELP_STRING([--enable-debug],[compile with debugging support])-if test x"$enable_debug" = x"yes" ; then- AC_DEFINE(DEBUG, 1, [Define if debugging is enabled.])-AC_ARG_ENABLE(deprecated,- AC_HELP_STRING([--disable-deprecated],[compile without deprecated API usage])- ,,enable_deprecated=yes)-if test "x$enable_deprecated" = no; then- DEBUG_CFLAGS = "$DEBUG_CFLAGS -DG_DISABLE_DEPRECATED"-if test x"$GCC" = x"yes"; then- CFLAGS="$CFLAGS -Wall -g3"-dnl #######################################################################-dnl #######################################################################-PKG_CHECK_MODULES(GFLIB, [gflib])-GFLIB_GENHEADER=`pkg-config --variable=gflib_genheader gflib`-AC_SUBST(GFLIB_GENHEADER)-dnl #######################################################################-dnl # check for gflib-ui-dnl #######################################################################-PKG_CHECK_MODULES(GFLIB_UI, [gflib-ui])-AC_SUBST(GFLIB_UI_CFLAGS)-dnl #######################################################################-dnl # check for glib and other glib dependencies-dnl #######################################################################-PKG_CHECK_MODULES(GLIB, [glib-2.0 >= 2.12.0 gobject-2.0 >= 2.12.0])-GLIB_GENMARSHAL=`pkg-config --variable=glib_genmarshal glib-2.0`-AC_SUBST(GLIB_GENMARSHAL)-dnl #######################################################################-dnl #######################################################################-AC_MSG_CHECKING([golden ticket])-PKG_CHECK_MODULES(GTK, [gtk+-2.0 >= 2.10.0])-dnl #######################################################################-dnl # do we want to build the tests?-dnl #######################################################################- AC_HELP_STRING([--enable-tests],[build test programs])-AM_CONDITIONAL(BUILD_TESTS, test x"$enable_tests" = x"yes")-dnl #######################################################################-dnl #######################################################################-dnl #######################################################################-dnl #######################################################################-dnl #######################################################################-dnl #######################################################################-echo AC_PACKAGE_NAME AC_PACKAGE_VERSION Configuration complete-echo Debugging enabled................: $enable_debug-echo Build tests......................: $enable_tests-echo Type make to compile--- a/gflib-gtk/gflib-gtk.pc.in Fri Jan 08 17:24:43 2010 -0600
+++ b/gflib-gtk/gflib-gtk.pc.in Mon Dec 20 00:17:04 2010 -0600
@@ -1,11 +1,12 @@
+prefix=@CMAKE_INSTALL_PREFIX@ libdir=${exec_prefix}/lib
-includedir=${prefix}/include/gflib-gtk-1.0+includedir=${prefix}/include/gflib-1.0/gflib-gtk -Description: Guifications Gtk library+Description: Guifications Gtk+ UI Library +Requires: gflib gflib-ui Libs: -L${libdir} -lgflib-gtk
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/gflib-gtk/gflib-gtk/CMakeLists.txt Mon Dec 20 00:17:04 2010 -0600
@@ -0,0 +1,79 @@
+############################################################################### +############################################################################### +set(GFLIB_GTK_BUILD_HEADERS +############################################################################### +# gf_lib_gtk.h generation +############################################################################### + DEPENDS ${GFLIB_GENHEADER} ${GFLIB_GTK_HEADERS} ${GFLIB_GTK_BUILT_HEADERS} + COMMAND ${GFLIB_GENHEADER} -s GF_LIB_GTK -d gflib-gtk + ${GFLIB_GTK_HEADERS} ${GFLIB_GTK_BUILT_HEADERS} > + ${CMAKE_CURRENT_BINARY_DIR}/gf_lib_gtk.h +############################################################################### +############################################################################### +add_library(gflib-gtk SHARED + ${GFLIB_GTK_BUILT_HEADERS} + # this is a hack to make sure this gets built +target_link_libraries(gflib-gtk +############################################################################### +############################################################################### +install(TARGETS gflib-gtk LIBRARY DESTINATION lib) +# install the single include into the main directory + FILES ${CMAKE_CURRENT_BINARY_DIR}/gf_lib_gtk.h + DESTINATION include/gflib-1.0 +# install the normal headers into the gflib-gtk directory +foreach(HEADER ${GFLIB_GTK_HEADERS}) + FILES ${CMAKE_CURRENT_SOURCE_DIR}/${HEADER} + DESTINATION include/gflib-1.0/gflib-gtk +# install the built headers into the gflib-gtk directory +foreach(HEADER ${GFLIB_GTK_BUILT_HEADERS}) + FILES ${CMAKE_CURRENT_BINARY_DIR}/${HEADER} + DESTINATION include/gflib-1.0/gflib-gtk --- a/gflib-gtk/gflib-gtk/Makefile.am Fri Jan 08 17:24:43 2010 -0600
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,48 +0,0 @@
-gfgtkincdir = $(includedir)/gflib-gtk-1.0/gflib-gtk-lib_LTLIBRARIES = libgflib-gtk.la-gfgtkinc_DATA = gf_lib_gtk.h-libgflib_gtk_la_SOURCES = \-libgflib_gtk_la_LIBADD = \-libgflib_gtk_la_LDFLAGS = \- -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)-INCLUDES = -I$(top_srcdir)- -DDATADIR=\"$(datadir)\" \- -DLIBDIR=\"$(libdir)\" \- -DLOCALEDIR=\"$(datadir)/locale\" \-gf_lib_gtk.h: $(gfgtkinc_HEADERS)- @$(GFLIB_GENHEADER) --symbol=GF_LIB_GTK_H --directory=gflib-gtk $(gfgtkinc_HEADERS) > gf_lib_gtk.h--- a/gflib-gtk/gflib-gtk/gf_gtk_core.c Fri Jan 08 17:24:43 2010 -0600
+++ b/gflib-gtk/gflib-gtk/gf_gtk_core.c Mon Dec 20 00:17:04 2010 -0600
@@ -42,8 +42,6 @@
-#include <gflib-gtk/gf_gtk_intl.h> #include <gflib/gf_core.h>
--- a/gflib-gtk/gflib-gtk/gf_gtk_gc.c Fri Jan 08 17:24:43 2010 -0600
+++ b/gflib-gtk/gflib-gtk/gf_gtk_gc.c Mon Dec 20 00:17:04 2010 -0600
@@ -21,7 +21,6 @@
#include <gflib-gtk/gf_gtk_color.h>
#include <gflib-gtk/gf_gtk_gc.h>
-#include <gflib-gtk/gf_gtk_intl.h> /******************************************************************************
--- a/gflib-gtk/gflib-gtk/gf_gtk_image.h Fri Jan 08 17:24:43 2010 -0600
+++ b/gflib-gtk/gflib-gtk/gf_gtk_image.h Mon Dec 20 00:17:04 2010 -0600
@@ -18,7 +18,7 @@
-#include <gflib/gf_lib.h>--- a/gflib-gtk/gflib-gtk/gf_gtk_intl.h Fri Jan 08 17:24:43 2010 -0600
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,41 +0,0 @@
- * Guifications - The end-all, be-all notification framework- * Copyright (C) 2003-2009 Gary Kramlich <grim@reaperworld.com>- * This program is free software: you can redistribute it and/or modify- * it under the terms of the GNU General Public License as published by- * the Free Software Foundation, either version 3 of the License, or- * (at your option) any later version.- * This program is distributed in the hope that it will be useful,- * but WITHOUT ANY WARRANTY; without even the implied warranty of- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the- * GNU General Public License for more details.- * You should have received a copy of the GNU General Public License- * along with this program. If not, see <http://www.gnu.org/licenses/>.-#endif /* HAVE_CONFIG_H */-# define _(x) dgettext(PACKAGE, x)-# define N_(String) dgettext_noop (PACKAGE, String)-# define N_(String) (String)-# define N_(String) (String)-# define ngettext(Singular, Plural, Number) ((Number == 1) ? (Singular) : (Plural))-#endif /* GF_GTK_INTL_H */--- a/gflib-gtk/tests/Makefile.am Fri Jan 08 17:24:43 2010 -0600
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,30 +0,0 @@
- -I$(top_builddir)/gflib-gtk/- $(top_builddir)/gflib-gtk/libgflib-gtk.la \-testimage_DEPENDENCIES=$(TEST_DEPS)-testimage_LDADD=$(LDADDS)-testimage_SOURCES=testimage.c--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/gflib-ui/CMakeLists.txt Mon Dec 20 00:17:04 2010 -0600
@@ -0,0 +1,9 @@
+cmake_minimum_required(VERSION 2.8) +GFLIB_LIBRARY_PROJECT(gflib-ui 0 0 1 dev) +add_subdirectory(gflib-ui) --- a/gflib-ui/Makefile.am Fri Jan 08 17:24:43 2010 -0600
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-SUBDIRS = gflib-ui doc po po-properties tests-DISTCHECK_CONFIGURE_FLAGS=--enable-gtk-doc- po-properties/ChangeLog-pcdatadir = $(libdir)/pkgconfig-libtool: $(LIBTOOL_DEPS)- $(SHELL) ./config.status --recheck--- a/gflib-ui/autogen.sh Fri Jan 08 17:24:43 2010 -0600
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,30 +0,0 @@
-# Guifications - The end-all, be-all notification framework-# Copyright (C) 2003-2009 Gary Kramlich <grim@reaperworld.com>-# This program is free software: you can redistribute it and/or modify-# it under the terms of the GNU General Public License as published by-# the Free Software Foundation, either version 3 of the License, or-# (at your option) any later version.-# This program is distributed in the hope that it will be useful,-# but WITHOUT ANY WARRANTY; without even the implied warranty of-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the-# GNU General Public License for more details.-# You should have received a copy of the GNU General Public License-# along with this program. If not, see <http://www.gnu.org/licenses/>.-which gflib-autogen.sh || {- echo "You need to install gflib to run autogen"-add_default_library_commands--- a/gflib-ui/configure.ac Fri Jan 08 17:24:43 2010 -0600
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,201 +0,0 @@
-dnl Process this file with autoconf to create configure.-dnl ################################################################-dnl # Initialize autoconf-dnl ################################################################-AC_INIT(gflib-ui, 0.0.1dev, guifications-devel@lists.guifications.org)-AC_CONFIG_SRCDIR(config.h.in)-AC_COPYRIGHT([Copyright 2003-2009 Gary Kramlich])-dnl ################################################################-dnl # Version information-dnl ################################################################-GFLIB_UI_MAJOR_VERSION=0-GFLIB_UI_MINOR_VERSION=0-GFLIB_UI_MICRO_VERSION=1-GFLIB_UI_DEVEL_VERSION=0-GFLIB_UI_VERSION=$GFLIB_UI_MAJOR_VERSION.$GFLIB_UI_MINOR_VERSION.$GFLIB_UI_MICRO_VERSION-if test "x$GFLIB_UI_DEVEL_VERSION" != "x0"; then- if test "x$GFLIB_UI_MICRO_VERSION" = "x0"; then- GFLIB_UI_MICRO_VERSION=$GFLIB_UI_DEVEL_VERSION- GFLIB_UI_VERSION=$GFLIB_UI_MAJOR_VERSION.$GFLIB_UI_MINOR_VERSION.$GFLIB_UI_MICRO_VERSION- GFLIB_UI_VERSION=$GFLIB_UI_VERSION.$GFLIB_UI_DEVEL_VERSION-AC_DEFINE_UNQUOTED(GFLIB_UI_MAJOR_VERSION, $GFLIB_UI_MAJOR_VERSION, [gflib-ui major version.])-AC_DEFINE_UNQUOTED(GFLIB_UI_MINOR_VERSION, $GFLIB_UI_MINOR_VERSION, [gflib-ui minor version.])-AC_DEFINE_UNQUOTED(GFLIB_UI_MICRO_VERSION, $GFLIB_UI_MICRO_VERSION, [gflib-ui micro version.])-AC_DEFINE_UNQUOTED(GFLIB_UI_VERSION, $GFLIB_UI_VERSION, [gflib-ui version])-AC_DEFINE_UNQUOTED(GFLIB_UI_VERSION_S, "$GFLIB_UI_VERSION", [gflib-ui version string])-dnl ################################################################-dnl # libtool versioning-dnl ################################################################-dnl # +1 : 0 : +1 == new interface that does not break old one.-dnl # +1 : 0 : 0 == removed an interface. Breaks old apps.-dnl # ? : +1 : ? == internal changes that doesn't break anything.-dnl # CURRENT : REVISION : AGE-LT_RELEASE=$GFLIB_UI_MAJOR_VERSION.$GFLIB_UI_MINOR_VERSION.$GFLIB_UI_MICRO_VERSION-dnl ################################################################-dnl # Initialize automake-dnl ################################################################-AM_INIT_AUTOMAKE([gnu dist-bzip2])-dnl ################################################################-dnl # Configuration file-dnl ################################################################-AM_CONFIG_HEADER(config.h)-dnl # Stash configure args-AC_DEFINE_UNQUOTED(CONFIG_ARGS, "$ac_configure_args", [configure arguments])-dnl #######################################################################-dnl # Make sure we have pkg-config-dnl #######################################################################-dnl #######################################################################-dnl #######################################################################-LIBTOOL="$LIBTOOL --silent"-dnl #######################################################################-dnl #######################################################################-AH_TOP([ /* our header */-dnl #######################################################################-dnl #######################################################################-GETTEXT_PACKAGE=gflib-ui-AC_SUBST(GETTEXT_PACKAGE)-AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, ["$GETTEXT_PACKAGE"], [Define the gettext package to be used])-[case "$CONFIG_FILES" in *po-properties/Makefile.in*)- sed -e "/POTFILES =/r po-properties/POTFILES" po-properties/Makefile.in > po-properties/Makefile-dnl #######################################################################-dnl # Look for the C compiler-dnl #######################################################################- AC_HELP_STRING([--enable-debug],[compile with debugging support])-if test x"$enable_debug" = x"yes" ; then- AC_DEFINE(DEBUG, 1, [Define if debugging is enabled.])-AC_ARG_ENABLE(deprecated,- AC_HELP_STRING([--disable-deprecated],[compile without deprecated API usage])- ,,enable_deprecated=yes)-if test "x$enable_deprecated" = no; then- DEBUG_CFLAGS = "$DEBUG_CFLAGS -DG_DISABLE_DEPRECATED"-if test "x$GCC" = "xyes"; then- CFLAGS="$CFLAGS -Wall -g3"-dnl #######################################################################-dnl #######################################################################-PKG_CHECK_MODULES(GFLIB, [gflib])-GFLIB_GENHEADER=`pkg-config --variable=gflib_genheader gflib`-AC_SUBST(GFLIB_GENHEADER)-dnl #######################################################################-dnl # check for glib and other glib dependencies-dnl #######################################################################-PKG_CHECK_MODULES(GLIB, [glib-2.0 >= 2.12.0 gobject-2.0 >= 2.12.0])-GLIB_GENMARSHAL=`pkg-config --variable=glib_genmarshal glib-2.0`-AC_SUBST(GLIB_GENMARSHAL)-dnl #######################################################################-dnl # do we want to build the tests?-dnl #######################################################################- AC_HELP_STRING([--enable-tests],[build test programs])-AM_CONDITIONAL(BUILD_TESTS, test x"$enable_tests" = x"yes")-dnl #######################################################################-dnl #######################################################################-dnl #######################################################################-dnl #######################################################################- po-properties/Makefile.in-dnl #######################################################################-dnl #######################################################################-echo AC_PACKAGE_NAME AC_PACKAGE_VERSION Configuration complete-echo Debugging enabled................: $enable_debug-echo Build tests......................: $enable_tests-echo Type make to compile--- a/gflib-ui/doc/Makefile.am Fri Jan 08 17:24:43 2010 -0600
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,4 +0,0 @@
--- a/gflib-ui/gflib-ui.pc.in Fri Jan 08 17:24:43 2010 -0600
+++ b/gflib-ui/gflib-ui.pc.in Mon Dec 20 00:17:04 2010 -0600
@@ -1,14 +1,11 @@
+prefix=@CMAKE_INSTALL_PREFIX@ libdir=${exec_prefix}/lib
includedir=${prefix}/include/gflib-1.0
-plugin_dir=${libdir}/guifications-gflib_genheader=gflib-genheader-Description: Guifications library+Description: Guifications User Interface Library Libs: -L${libdir} -lgflib-ui
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/gflib-ui/gflib-ui/CMakeLists.txt Mon Dec 20 00:17:04 2010 -0600
@@ -0,0 +1,92 @@
+############################################################################### +############################################################################### +set(GFLIB_UI_BUILT_HEADERS +############################################################################### +# gf_lib_ui.h generation +############################################################################### + DEPENDS ${GFLIB_GENHEADER} ${GFLIB_UI_HEADERS} ${GFLIB_UI_BUILT_HEADERS} + COMMAND ${GFLIB_GENHEADER} -s GF_LIB_UI_H -d gflib-ui + ${GFLIB_UI_HEADERS} ${GFLIB_UI_BUILT_HEADERS} > + ${CMAKE_CURRENT_BINARY_DIR}/gf_lib_ui.h +############################################################################### +############################################################################### +add_library(gflib-ui SHARED + ${GFLIB_UI_BUILT_HEADERS} + # this is a hack to make this get built since nothing depends on it +target_link_libraries(gflib-ui +############################################################################### +############################################################################### +install(TARGETS gflib-ui LIBRARY DESTINATION lib) +# install the single include into the main directory + FILES ${CMAKE_CURRENT_BINARY_DIR}/gf_lib_ui.h + DESTINATION include/gflib-1.0 +# install the normal headers into the gflib-ui directory +foreach(HEADER ${GFLIB_UI_HEADERS}) + FILES ${CMAKE_CURRENT_SOURCE_DIR}/${HEADER} + DESTINATION include/gflib-1.0/gflib-ui +# install the built headers into the gflib-ui directory +foreach(HEADER ${GFLIB_UI_BUILT_HEADERS}) + FILES ${CMAKE_CURRENT_BINARY_DIR}/${HEADER} + DESTINATION include/gflib-1.0/gflib-ui --- a/gflib-ui/gflib-ui/Makefile.am Fri Jan 08 17:24:43 2010 -0600
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,61 +0,0 @@
-gfuiincdir = $(includedir)/gflib-1.0/gflib-ui-lib_LTLIBRARIES = libgflib-ui.la-gfuiinc_DATA = gf_lib_ui.h-libgflib_ui_la_SOURCES = \-libgflib_ui_la_LIBADD = \-libgflib_ui_la_LDFLAGS = \- -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)-INCLUDES = -I$(top_srcdir)- -DDATADIR=\"$(datadir)\" \- -DLIBDIR=\"$(libdir)\" \- -DLOCALEDIR=\"$(datadir)/locale\" \-gf_lib_ui.h: $(gfgtkinc_HEADERS)- @$(GFLIB_GENHEADER) --symbol=GF_LIB_UI_H --directory=gflib-ui $(gfuiinc_HEADERS) > gf_lib_ui.h--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/gflib-ui/tests/CMakeLists.txt Mon Dec 20 00:17:04 2010 -0600
@@ -0,0 +1,2 @@
--- a/gflib-ui/tests/Makefile.am Fri Jan 08 17:24:43 2010 -0600
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/gflib/CMakeLists.txt Mon Dec 20 00:17:04 2010 -0600
@@ -0,0 +1,19 @@
+cmake_minimum_required(VERSION 2.8) +set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/Modules) +GFLIB_LIBRARY_PROJECT(gflib 0 0 1 dev) +pkg_check_modules(GMODULE REQUIRED gmodule-2.0>=2.16.0) +include_directories(${GMODULE_INCLUDE_DIRS}) +link_directories(${GMODULE_LIBRARY_DIRS}) +add_subdirectory(contrib) --- a/gflib/Makefile.am Fri Jan 08 17:24:43 2010 -0600
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,27 +0,0 @@
-SUBDIRS = gflib doc po po-properties tests contrib-DISTCHECK_CONFIGURE_FLAGS=--enable-gtk-doc- po-properties/ChangeLog-pcdatadir = $(libdir)/pkgconfig-libtool: $(LIBTOOL_DEPS)- $(SHELL) ./config.status --recheck-bin_SCRIPTS=$(top_srcdir)/gflib-autogen.sh--- a/gflib/autogen.sh Fri Jan 08 17:24:43 2010 -0600
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,26 +0,0 @@
-# Guifications - The end-all, be-all notification framework-# Copyright (C) 2003-2009 Gary Kramlich <grim@reaperworld.com>-# This program is free software: you can redistribute it and/or modify-# it under the terms of the GNU General Public License as published by-# the Free Software Foundation, either version 3 of the License, or-# (at your option) any later version.-# This program is distributed in the hope that it will be useful,-# but WITHOUT ANY WARRANTY; without even the implied warranty of-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the-# GNU General Public License for more details.-# You should have received a copy of the GNU General Public License-# along with this program. If not, see <http://www.gnu.org/licenses/>.-# we source this without a path because we always want to use the in tree copy-add_default_library_commands--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/gflib/cmake/CMakeLists.txt Mon Dec 20 00:17:04 2010 -0600
@@ -0,0 +1,2 @@
+add_subdirectory(Modules) --- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/gflib/cmake/Modules/CMakeLists.txt Mon Dec 20 00:17:04 2010 -0600
@@ -0,0 +1,2 @@
+install(FILES gflib.cmake DESTINATION ${CMAKE_ROOT}/Modules) --- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/gflib/cmake/Modules/gflib.cmake Mon Dec 20 00:17:04 2010 -0600
@@ -0,0 +1,124 @@
+macro(_gflib_add_dependencies _project _is_gflib) + # added /usr/local/lib/pkgconfig to PKG_CONFIG_PATH incase someone has + # installed some software themselves + set(ENV{PKG_CONFIG_PATH} $ENV{PKG_CONFIG_PATH} /usr/local/lib/pkgconfig) + # if we're on osx add the fink and macports pkg-config paths + if(${CMAKE_HOST_APPLE}) + set(ENV{PKG_CONFIG_PATH} $ENV{PKG_CONFIG_PATH} /sw/lib/pkgconfig /opt/local/lib/pkgconfig) + endif(${CMAKE_HOST_APPLE}) + # look for glib and it's helper tools + pkg_check_modules(GLIB REQUIRED + find_program(GLIB_GENMARSHAL + DOC "glib-genmarshal executable" + mark_as_advanced(GLIB_GENMARSHAL) + find_program(GLIB_MKENUMS + DOC "glib-mkenums executable" + mark_as_advanced(GLIB_MKENUMS) + DOC "gtester executable" + mark_as_advanced(GTESTER) + # now add gflib as a dependency unless this is gflib + pkg_check_modules(GFLIB REQUIRED gflib) + # look for gflib-genheader + find_program(GFLIB_GENHEADER + DOC "gflib-genheader executable" + mark_as_advanced(GFLIB_GENHEADER) + endif(NOT ${_is_gflib}) +endmacro(_gflib_add_dependencies) +# This macro adds our include directories, link directories, and definitions +macro(_gflib_add_build_info _project _is_gflib) + -DGETTEXT_PACKAGE="${_project}" + -DDATADIR="${CMAKE_INSTALL_PREFIX}/share" + -DLIBDIR="${CMAKE_INSTALL_PREFIX}/lib" + -DLOCALEDIR="${CMAKE_INSTALL_PREFIX}/locale" + include_directories(${GFLIB_INCLUDE_DIRS}) + link_directories(${GFLIB_LIBRARY_DIRS}) + endif(NOT ${_is_gflib}) +endmacro(_gflib_add_build_info) +macro(GFLIB_PROJECT _project _major _minor _micro _extra) + string(TOUPPER ${_project} _project_upper) + set(${_project_upper}_MAJOR_VERSION ${_major}) + set(${_project_upper}_MINOR_VERSION ${_minor}) + set(${_project_upper}_MICRO_VERSION ${_micro}) + set(${_project_upper}_EXTRA_VERSION ${_extra}) + set(VERSION ${${_project_upper}_MAJOR_VERSION}.${${_project_upper}_MINOR_VERSION}.${${_project_upper}_MICRO_VERSION}${${_project_upper}_EXTRA_VERSION}) + string(COMPARE EQUAL ${_project} gflib _is_gflib) + _gflib_add_dependencies(${_project} ${_is_gflib}) + _gflib_add_build_info(${_project} ${_is_gflib}) + # we assume we still have all the autotools documentation files to install + FILES AUTHORS ChangeLog COPYING NEWS README + DESTINATION share/doc/${_project} +macro(GFLIB_LIBRARY_PROJECT _project _major _minor _micro _extra) + # call the main project macro + GFLIB_PROJECT(${_project} ${_major} ${_minor} ${_micro} ${_extra}) + # since this is a library, we assume that the src directory is the project + # name and add it and the binary directory to our include_directories + ${CMAKE_SOURCE_DIR}/${_project} + ${CMAKE_BINARY_DIR}/${_project} + # add and install the pkg-config file + configure_file(${_project}.pc.in ${_project}.pc @ONLY) + FILES ${CMAKE_CURRENT_BINARY_DIR}/${_project}.pc + DESTINATION lib/pkgconfig +endmacro(GFLIB_LIBRARY_PROJECT) --- a/gflib/configure.ac Fri Jan 08 17:24:43 2010 -0600
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,196 +0,0 @@
-dnl Process this file with autoconf to create configure.-dnl ################################################################-dnl # Initialize autoconf-dnl ################################################################-AC_INIT(gflib, 0.0.1dev, guifications-devel@lists.guifications.org)-AC_CONFIG_SRCDIR(config.h.in)-AC_COPYRIGHT([Copyright 2003-2009 Gary Kramlich])-dnl ################################################################-dnl # Version information-dnl ################################################################-GFLIB_VERSION=$GFLIB_MAJOR_VERSION.$GFLIB_MINOR_VERSION.$GFLIB_MICRO_VERSION-if test "x$GFLIB_DEVEL_VERSION" != "x0"; then- if test "x$GFLIB_MICRO_VERSION" = "x0"; then- GFLIB_MICRO_VERSION=$GFLIB_DEVEL_VERSION- GFLIB_VERSION=$GFLIB_MAJOR_VERSION.$GFLIB_MINOR_VERSION.$GFLIB_MICRO_VERSION- GFLIB_VERSION=$GFLIB_VERSION.$GFLIB_DEVEL_VERSION-AC_DEFINE_UNQUOTED(GFLIB_MAJOR_VERSION, $GFLIB_MAJOR_VERSION, [gflib major version.])-AC_DEFINE_UNQUOTED(GFLIB_MINOR_VERSION, $GFLIB_MINOR_VERSION, [gflib minor version.])-AC_DEFINE_UNQUOTED(GFLIB_MICRO_VERSION, $GFLIB_MICRO_VERSION, [gflib micro version.])-AC_DEFINE_UNQUOTED(GFLIB_VERSION, $GFLIB_VERSION, [gflib version])-AC_DEFINE_UNQUOTED(GFLIB_VERSION_S, "$GFLIB_VERSION", [gflib version string])-dnl ################################################################-dnl # libtool versioning-dnl ################################################################-dnl # +1 : 0 : +1 == new interface that does not break old one.-dnl # +1 : 0 : 0 == removed an interface. Breaks old apps.-dnl # ? : +1 : ? == internal changes that doesn't break anything.-dnl # CURRENT : REVISION : AGE-LT_RELEASE=$GFLIB_MAJOR_VERSION.$GFLIB_MINOR_VERSION.$GFLIB_MICRO_VERSION-dnl ################################################################-dnl # Initialize automake-dnl ################################################################-AM_INIT_AUTOMAKE([gnu dist-bzip2])-dnl ################################################################-dnl # Configuration file-dnl ################################################################-AM_CONFIG_HEADER(config.h)-dnl # Stash configure args-AC_DEFINE_UNQUOTED(CONFIG_ARGS, "$ac_configure_args", [configure arguments])-dnl #######################################################################-dnl # Make sure we have pkg-config-dnl #######################################################################-dnl #######################################################################-dnl #######################################################################-LIBTOOL="$LIBTOOL --silent"-dnl #######################################################################-dnl # I'm lazy and figured config.h is the best place for this ;)-dnl #######################################################################-AC_DEFINE_UNQUOTED(GFLIB_WEBSITE, "http://guifications.org/", [gflib website])-dnl #######################################################################-dnl #######################################################################-AH_TOP([ /* our header */-dnl #######################################################################-dnl #######################################################################-AC_SUBST(GETTEXT_PACKAGE)-AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, ["$GETTEXT_PACKAGE"], [Define the gettext package to be used])-[case "$CONFIG_FILES" in *po-properties/Makefile.in*)- sed -e "/POTFILES =/r po-properties/POTFILES" po-properties/Makefile.in > po-properties/Makefile-dnl #######################################################################-dnl # Look for the C compiler-dnl #######################################################################-AC_MSG_CHECKING([WMD's])- AC_HELP_STRING([--enable-debug],[compile with debugging support])-if test x"$enable_debug" = x"yes" ; then- AC_DEFINE(DEBUG, 1, [Define if debugging is enabled.])-if test x"$GCC" = x"yes"; then- CFLAGS="$CFLAGS -Wall -g3"-dnl #######################################################################-dnl # Check for python (this is just used for random stuff right now)-dnl #######################################################################-AC_PATH_PROG([PYTHON], [python], [no])-AM_CONDITIONAL([HAVE_PYTHON], test x"$PYTHON" != x"no")-dnl #######################################################################-dnl # check for glib and other glib dependencies-dnl #######################################################################-PKG_CHECK_MODULES(GLIB, [glib-2.0 >= 2.16.0 gobject-2.0 >= 2.16.0 gthread-2.0 >= 2.16.0])-GLIB_GENMARSHAL=`pkg-config --variable=glib_genmarshal glib-2.0`-AC_SUBST(GLIB_GENMARSHAL)-GLIB_MKENUMS=`pkg-config --variable=glib_mkenums glib-2.0`-PKG_CHECK_MODULES(GMODULE, [gmodule-2.0 >= 2.16.0])-AC_SUBST(GMODULE_CFLAGS)-dnl #######################################################################-dnl #######################################################################-dnl #######################################################################-dnl #######################################################################- doc/gflib-query-plugins.1- po-properties/Makefile.in-dnl #######################################################################-dnl #######################################################################-echo AC_PACKAGE_NAME AC_PACKAGE_VERSION Configuration complete-echo Debugging enabled................: $enable_debug-echo Type make to compile--- a/gflib/contrib/Makefile.am Fri Jan 08 17:24:43 2010 -0600
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,19 +0,0 @@
-#BUILT_OBJECTS += gflib.vim-gflib.vim: gflib.vim-config.py- @echo -n "Generating gflib.vim..."- @vim-syn-gen.py gflib.vim-config.py > gflib.vim-CLEANFILES = $(BUILT_OBJECTS)--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/gflib/doc/CMakeLists.txt Mon Dec 20 00:17:04 2010 -0600
@@ -0,0 +1,5 @@
+configure_file(gflib-genheader.1.in gflib-genheader.1) +configure_file(gflib-query-plugins.1.in gflib-query-plugins.1) --- a/gflib/doc/Makefile.am Fri Jan 08 17:24:43 2010 -0600
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,8 +0,0 @@
--- a/gflib/gflib-autogen.sh Fri Jan 08 17:24:43 2010 -0600
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,362 +0,0 @@
-# Guifications - The end-all, be-all notification framework-# Copyright (C) 2003-2009 Gary Kramlich <grim@reaperworld.com>-# This program is free software: you can redistribute it and/or modify-# it under the terms of the GNU General Public License as published by-# the Free Software Foundation, either version 3 of the License, or-# (at your option) any later version.-# This program is distributed in the hope that it will be useful,-# but WITHOUT ANY WARRANTY; without even the implied warranty of-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the-# GNU General Public License for more details.-# You should have received a copy of the GNU General Public License-# along with this program. If not, see <http://www.gnu.org/licenses/>.-###############################################################################-###############################################################################-###############################################################################-# A list library similar to the lists in TCL-# Copyright (C) 2009 Ethan Blanton-# Heavily modified by Gary Kramlich-###############################################################################- # dirty hack to make sure we handle empty item. Basically we just turn- if [ -z "${__item}" ] ; then- eval "${__list}=\`catlist ${__list} | sed -e '${__index}i\\\\- # dirty hack to make sure we handle empty item. Basically we just turn- if [ -z "${__item}" ] ; then- if lempty ${__list} ; then- eval "${__list}='${__item}'"- __index=`llength ${__list}`- eval "${__list}=\"\`catlist ${__list}\`- # dirty hack to make sure we handle empty item. Basically we just turn- if [ -z "${__item}" ] ; then- eval "${__list}=\`catlist ${__list} | sed -e '${__index},${__index}c\\\\- cat <<EOF | sed -e "$2!d"- catlist $1 | sed -e "$2,$3!d"- catlist $1 | while read ITEM; do- catlist $1 | sed -n "/$2/{-###############################################################################-###############################################################################- lappend COMMANDS ${__cmd}- lappend FLAGS ${__flags}- __index=`lsearch COMMANDS ${__insert}`- linsert COMMANDS ${__index} ${__cmd}- linsert FLAGS ${__index} ${__flags}- __index=`lsearch COMMANDS ${__old_command}`- test ${__index} -ne 0 || return- lreplace COMMANDS ${__index} ${__new_command}- test -z "${__flags}" || lreplace FLAGS ${__index} ${__flags}- test "${ARGS_FILE}" || ARGS_FILE="autogen.args"- printf "checking for argument file %s: " ${ARGS_FILE}- if test -f ${ARGS_FILE} ; then- printf "sourcing %s ... " ${ARGS_FILE}- # dash will only source a file from a source file if it's in the path- # so we add . to the PATH for the source and then revert the path back- printf "checking for ${__cmd}... "- if [ x"${__bin}" = x"" ] ; then- echo "${__cmd} is required to build ${PACKAGE}!"- catlist COMMANDS | while read __cmd; do- # we need to make sure to use a six-character template because some versions- # of mktemp blow up on anything shorter or longer.- __output=`mktemp autogen-XXXXXX`- # we have to stash ${@} into a variable, otherwise printf has "issues" if- # ${@} was expanded from a variable. Fortunately, this lets us clean up- # the output a bit too.- if [ x"${__args}" != x"" ] ; then- if [ -n "${__args}" ] ; then- __display="${__display} ${__args}"- printf "running '${__display}' ... "- ${__cmd} ${__args} >${__output} 2>&1- __len=`llength COMMANDS`- for i in `${SEQ_COMMAND} 1 ${__len}` ; do- __cmd=`lindex COMMANDS ${i}`- __flags=`lindex FLAGS ${i}`- run_command ${__cmd} ${__flags}- echo "running configure ${@}..."- ./configure ${CONFIGURE_FLAGS} "${@}"-add_default_commands () {- add_command libtoolize -c -f --automake- add_command intltoolize -c -f --automake- add_command automake -a -c -f --gnu- add_command autoconf -f-add_default_library_commands () {- # gtkdocize needs be to run before aclocal, so we insert it before aclocal- insert_command aclocal gtkdocize --copy- echo `lsearch COMMANDS ${1}`-###############################################################################-# Platform specific stuff-###############################################################################- # run the bsd platform specific stuff too- # change libtoolize to glibtoolize- update_command libtoolize glibtoolize- # look for fink and add it's aclocal dir to the aclocal flags- if [ -d /sw/share/aclocal ] ; then- __flags="${__flags} -I /sw/share/aclocal"- # look for macports and add it's aclocal dir to the aclocal flags- if [ -d /opt/local/share/aclocal ] ; then- __flags="${__flags} -I /opt/local/share/aclocal"- update_command aclocal aclocal ${__flags}- printf "adjusting for platform '%s' ... " ${__platform} -###############################################################################-###############################################################################- if [ x"${FIGLET}" != x"" ] ; then- echo "build system is being generated"- echo "autogenerating build system for '${PACKAGE}'"- test $? != 0 && exit -1- test $? != 0 && exit -1- # remove our cleanup trap--- a/gflib/gflib.pc.in Fri Jan 08 17:24:43 2010 -0600
+++ b/gflib/gflib.pc.in Mon Dec 20 00:17:04 2010 -0600
@@ -1,11 +1,12 @@
+prefix=@CMAKE_INSTALL_PREFIX@ +bindir=${exec_prefix}/bin libdir=${exec_prefix}/lib
includedir=${prefix}/include/gflib-1.0
plugin_dir=${libdir}/guifications
-gflib_genheader=gflib-genheader+gflib_genheader=${bindir}/gflib-genheader Description: Guifications library
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/gflib/gflib/CMakeLists.txt Mon Dec 20 00:17:04 2010 -0600
@@ -0,0 +1,201 @@
+############################################################################### +# gflib sources - these need to be before everything else +############################################################################### + gf_connection_manager.h + gf_native_plugin_loader.h + gf_preference_engine_null.h + gf_preference_engine_xml.h + gf_preferences_proxy_entry.h + gf_connection_manager.c + gf_native_plugin_loader.c + gf_preference_engine_null.c + gf_preference_engine_xml.c + gf_preferences_proxy_entry.c +############################################################################### +# gflib-genheader executable +############################################################################### +add_executable(gflib-genheader gf_genheader.c) +target_link_libraries(gflib-genheader ${GLIB_LIBRARIES}) +############################################################################### +############################################################################### + DEPENDS gflib-genheader ${GFLIB_HEADERS} ${GFLIB_BUILT_HEADERS} + COMMAND gflib-genheader -s GF_LIB_H -d gflib + ${GFLIB_HEADERS} ${GFLIB_BUILT_HEADERS} > + ${CMAKE_CURRENT_BINARY_DIR}/gf_lib.h +############################################################################### +# gflib-query-plugins executable +############################################################################### +add_executable(gflib-query-plugins gf_query_plugins.c gf_lib.h) +target_link_libraries(gflib-query-plugins ${GLIB_LIBRARIES} gflib) +############################################################################### +# gf_enum.[ch] generation +############################################################################### + DEPENDS ${ENUM_HEADERS} + WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} + COMMAND ${GLIB_MKENUMS} --template gf_enum.h.template ${ENUM_HEADERS} > + ${CMAKE_CURRENT_BINARY_DIR}/gf_enum.h + DEPENDS ${ENUM_HEADERS} gf_enum.h + WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} + COMMAND ${GLIB_MKENUMS} --template gf_enum.c.template ${ENUM_HEADERS} > + ${CMAKE_CURRENT_BINARY_DIR}/gf_enum.c +############################################################################### +# gf_marshallers.[ch] generation +############################################################################### + OUTPUT gf_marshallers.h + DEPENDS gf_marshallers.list + WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} + COMMAND ${GLIB_GENMARSHAL} --header --prefix=gf_marshal gf_marshallers.list + > ${CMAKE_CURRENT_BINARY_DIR}/gf_marshallers.h + OUTPUT gf_marshallers.c + DEPENDS gf_marshallers.list gf_marshallers.h + WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} + COMMAND ${GLIB_GENMARSHAL} --body --prefix=gf_marshal gf_marshallers.list + > ${CMAKE_CURRENT_BINARY_DIR}/gf_marshallers.c +############################################################################### +############################################################################### +add_library(gflib SHARED +target_link_libraries(gflib +############################################################################### +############################################################################### +install(TARGETS gflib LIBRARY DESTINATION lib) +# install gflib-query-plugins and gflib-genheader +install(TARGETS gflib-query-plugins gflib-genheader RUNTIME DESTINATION bin) +# install the single include into the main directory + FILES ${CMAKE_CURRENT_BINARY_DIR}/gf_lib.h + DESTINATION include/gflib-1.0 +# install the normal headers into the gflib subdirectory +foreach(HEADER ${GFLIB_HEADERS} ${GFLIB_EXTRA_HEADERS}) + FILES ${CMAKE_CURRENT_SOURCE_DIR}/${HEADER} + DESTINATION include/gflib-1.0/gflib +#install the built headers into the gflib subdirectory +foreach(HEADER ${GFLIB_BUILT_HEADERS}) + FILES ${CMAKE_CURRENT_BINARY_DIR}/${HEADER} + DESTINATION include/gflib-1.0/gflib --- a/gflib/gflib/Makefile.am Fri Jan 08 17:24:43 2010 -0600
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,159 +0,0 @@
-bin_PROGRAMS=gflib-queryplugins gflib-genheader-gflib_queryplugins_SOURCES=\-gflib_queryplugins_LDADD=\-gflib_genheader_SOURCES=\-gfincdir = $(includedir)/gflib-1.0/gflib-lib_LTLIBRARIES = libgflib.la- gf_client_connection.h \- gf_connection_manager.h \- gf_native_plugin_loader.h \- gf_preference_engine.h \- gf_preference_engine_null.h \- gf_preference_engine_xml.h \- gf_preferences_proxy.h \- gf_preferences_proxy_entry.h \- gf_server_connection.h \-gfinc_DATA = gf_lib.h gf_intl.h- gf_client_connection.c \- gf_connection_manager.c \- gf_native_plugin_loader.c \- gf_preference_engine.c \- gf_preference_engine_null.c \- gf_preference_engine_xml.c \- gf_preferences_proxy.c \- gf_preferences_proxy_entry.c \- gf_server_connection.c \- -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)-INCLUDES = -I$(top_srcdir) - -DDATADIR=\"$(datadir)\" \- -DLIBDIR=\"$(libdir)\" \- -DLOCALEDIR=\"$(datadir)/locale\" \-MARSHALSOURCES = gf_marshallers.c gf_marshallers.h-ENUMSOURCES = gf_enum.c gf_enum.h-gf_enum.c: $(enum_headers) $(top_srcdir)/gflib/gf_enum.c.template- @echo "Generating $@ ... "- $(GLIB_MKENUMS) --template $@.template $(enum_headers) > $@.tmp && mv $@.tmp $@-gf_enum.h: $(enum_headers) $(top_srcdir)/gflib/gf_enum.h.template- @echo "Generating $@ ... "- $(GLIB_MKENUMS) --template $@.template $(enum_headers) > $@.tmp && mv $@.tmp $@-gf_lib.h: gflib-genheader $(gfinc_HEADERS)- @echo "Generating $@ ... "- ./gflib-genheader -s GF_LIB_H -d gflib $(gfinc_HEADERS) > $@.tmp && mv $@.tmp $@-gf_marshallers.h: gf_marshallers.list- @echo "Generating $@ ..."- $(GLIB_GENMARSHAL) --prefix=gf_marshal gf_marshallers.list --header > $@.tmp && mv $@.tmp $@-gf_marshallers.c: gf_marshallers.list gf_marshallers.h- @echo "Generating $@ ..."- $(GLIB_GENMARSHAL) --prefix=gf_marshal gf_marshallers.list --body > $@.tmp && mv $@.tmp $@-CLEANFILES = $(BUILT_SOURCES)- @if [ `id -u` == 0 ] ; then echo -n "Running ldconfig... "; ldconfig; echo "done"; else echo "Not running ldconfig since you are not root."; fi--- a/gflib/gflib/gf_native_plugin.c Fri Jan 08 17:24:43 2010 -0600
+++ b/gflib/gflib/gf_native_plugin.c Mon Dec 20 00:17:04 2010 -0600
@@ -132,11 +132,10 @@
GfPluginInfo *info = gf_plugin_get_info(GF_PLUGIN(native));
const gchar *name = (info) ? info->name : "(unknown)";
- gf_log_warning("GfNativePlugin",- "Fatal error - Could not reload previously loaded "+ gf_log_critical("GfNativePlugin", + "Fatal error - Could not reload previously loaded " --- a/gflib/gflib/gf_query_plugins.c Fri Jan 08 17:24:43 2010 -0600
+++ b/gflib/gflib/gf_query_plugins.c Mon Dec 20 00:17:04 2010 -0600
@@ -26,7 +26,7 @@
-#include <gflib/gf_lib.h>--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/gflib/po/CMakeLists.txt Mon Dec 20 00:17:04 2010 -0600
@@ -0,0 +1,16 @@
+ find_program(INTLTOOL_UPDATE intltool-update) + mark_as_advanced(INTLTOOL_UPDATE) + find_program(XGETTEXT xgettext) + mark_as_advanced(XGETTEXT) + find_program(MSGMERGE msgmerge) + mark_as_advanced(MSGMERGE) + find_program(MSGFMT msgfmt) + mark_as_advanced(MSGFMT) --- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/gflib/tests/CMakeLists.txt Mon Dec 20 00:17:04 2010 -0600
@@ -0,0 +1,13 @@
+add_executable(testlog testlog.c) +target_link_libraries(testlog ${GLIB_LIBRARIES} gflib) +list(APPEND TESTS testlog) +set(GTESTER_TESTS "${TESTS}") + ${GTESTER} -k --verbose -o testgflib.log --- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/guifications-daemon-mpris/CMakeLists.txt Mon Dec 20 00:17:04 2010 -0600
@@ -0,0 +1,67 @@
+cmake_minimum_required(VERSION 2.8) +############################################################################### +############################################################################### +project(guifications-daemon-mpris C) +set(GUIFICATIONS_DAEMON_MPRIS_MAJOR_VERSION 0) +set(GUIFICATIONS_DAEMON_MPRIS_MINOR_VERSION 0) +set(GUIFICATIONS_DAEMON_MPRIS_MICRO_VERSION 1) +set(GUIFICATIONS_DAEMON_MPRIS_EXTRA_VERSION dev) +set(VERSION ${GUIFICATIONS_DAEMON_MPRIS_MAJOR_VERSION}.${GUIFICATIONS_DAEMON_MPRIS_MINOR_VERSION}.${GUIFICATIONS_DAEMON_MPRIS_MICRO_VERSION}${GUIFICATIONS_DAEMON_MPRIS_EXTRA_VERSION}) +############################################################################### +############################################################################### +pkg_check_modules(GLIB REQUIRED +pkg_check_modules(GFLIB REQUIRED gflib) +pkg_check_modules(GUIFICATIONS_DAEMON REQUIRED guifications-daemon) +pkg_check_modules(MPRIS mpris) +############################################################################### +############################################################################### + -DGETTEXT_PACKAGE="guifications-daemon-mpris" + -DDATADIR="${CMAKE_INSTALL_PREFIX}/share" + -DLOCALEDIR="${CMAKE_INSTALL_PREFIX}/locale" +############################################################################### +############################################################################### +add_subdirectory(pixmaps) +############################################################################### +############################################################################### + FILES AUTHORS ChangeLog COPYING NEWS README + DESTINATION share/doc/guifications-daemon-mpris --- a/guifications-daemon-mpris/Makefile.am Fri Jan 08 17:24:43 2010 -0600
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-libtool: $(LIBTOOL_DEPS)- $(SHELL) ./config.status --recheck--- a/guifications-daemon-mpris/autogen.sh Fri Jan 08 17:24:43 2010 -0600
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,30 +0,0 @@
-# Guifications - The end-all, be-all notification framework-# Copyright (C) 2003-2009 Gary Kramlich <grim@reaperworld.com>-# This program is free software: you can redistribute it and/or modify-# it under the terms of the GNU General Public License as published by-# the Free Software Foundation, either version 3 of the License, or-# (at your option) any later version.-# This program is distributed in the hope that it will be useful,-# but WITHOUT ANY WARRANTY; without even the implied warranty of-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the-# GNU General Public License for more details.-# You should have received a copy of the GNU General Public License-# along with this program. If not, see <http://www.gnu.org/licenses/>.-which gflib-autogen.sh || {- echo "You need to install gflib to run autogen"--- a/guifications-daemon-mpris/configure.ac Fri Jan 08 17:24:43 2010 -0600
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,141 +0,0 @@
-dnl Process this file with autoconf to create configure.-dnl ################################################################-dnl # Initialize autoconf-dnl ################################################################-AC_INIT(guifications-daemon-mpris, 0.0.1dev, guifications-devel@lists.guifications.org)-AC_CONFIG_SRCDIR(config.h.in)-AC_COPYRIGHT([Copyright 2003-2009 Gary Kramlich])-dnl ################################################################-dnl # Initialize automake-dnl ################################################################-AM_INIT_AUTOMAKE([foreign dist-bzip2])-dnl # disable the static library-dnl ################################################################-dnl # Configuration file-dnl ################################################################-AM_CONFIG_HEADER(config.h)-dnl # Stash configure args-AC_DEFINE_UNQUOTED(CONFIG_ARGS, "$ac_configure_args", [configure arguments])-dnl #######################################################################-dnl #######################################################################-LIBTOOL="$LIBTOOL --silent"-dnl #######################################################################-dnl #######################################################################-AH_TOP([ /* our header */-AC_MSG_CHECKING([absolutely nothing])-dnl #######################################################################-dnl #######################################################################-GETTEXT_PACKAGE=guifications-mpris-AC_SUBST(GETTEXT_PACKAGE)-AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, ["$GETTEXT_PACKAGE"], [Define the gettext package to be used])-dnl #######################################################################-dnl # Look for the C compiler-dnl #######################################################################-AC_MSG_CHECKING([black hole])-AC_MSG_RESULT([found c:1,3])-AC_ARG_ENABLE(debug, [ --enable-debug compile with debugging support],,enable_debug=no)-if test "x$enable_debug" = "xyes" ; then- AC_DEFINE(DEBUG, 1, [Define if debugging is enabled.])- if test "x$GCC" = "xyes"; then- CFLAGS="$CFLAGS -Wall -g3"-dnl #######################################################################-dnl # check for gflib and gflib-plugin-dnl #######################################################################-PKG_CHECK_MODULES(GFLIB, gflib)-GFLIB_GENHEADER=`pkg-config --variable=gflib_genheader gflib`-AC_SUBST(GFLIB_GENHEADER)-dnl #######################################################################-dnl # check for gflib and gflib-plugin-dnl #######################################################################-PKG_CHECK_MODULES(GFB, guifications-daemon)-if test x"${prefix}" = x"NONE" ; then- GFD_PLUGIN_DIR=`pkg-config --variable=plugin_dir guifications-daemon`- GFD_PLUGIN_DIR="${prefix}/lib/guifications-daemon/"-AC_SUBST(GFD_PLUGIN_DIR)-dnl #######################################################################-dnl # check for glib and other glib dependencies-dnl #######################################################################-PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.6.0 gobject-2.0 >= 2.6.0)-dnl #######################################################################-dnl #######################################################################-PKG_CHECK_MODULES(MPRIS, mpris)-dnl #######################################################################-dnl #######################################################################-dnl #######################################################################-dnl #######################################################################-echo AC_PACKAGE_NAME AC_PACKAGE_VERSION Configuration complete-echo Debugging enabled................: $enable_debug-echo gflib plugin directory...........: $GFD_PLUGIN_DIR-echo Type make to compile--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/guifications-daemon-mpris/pixmaps/CMakeLists.txt Mon Dec 20 00:17:04 2010 -0600
@@ -0,0 +1,8 @@
+foreach(PIXMAP ${PIXMAPS}) + install(FILES ${PIXMAP} DESTINATION share/pixmaps/guifications-daemon/mpris) --- a/guifications-daemon-mpris/pixmaps/Makefile.am Fri Jan 08 17:24:43 2010 -0600
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,4 +0,0 @@
-pixmapdir=$(datadir)/pixmaps/guifications-daemon/mpris--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/guifications-daemon-mpris/src/CMakeLists.txt Mon Dec 20 00:17:04 2010 -0600
@@ -0,0 +1,29 @@
+############################################################################### +# guifications-daemon-mpris target +############################################################################### +set(GUIFICATIONS_DAEMON_MPRIS_HEADERS +set(GUIFICATIONS_DAEMON_MPRIS_SOURCES + guifications-daemon-mpris.c +add_library(guifications-daemon-mpris MODULE + ${GUIFICATIONS_DAEMON_MPRIS_HEADERS} + ${GUIFICATIONS_DAEMON_MPRIS_SOURCES} +target_link_libraries(guifications-daemon-mpris +############################################################################### +############################################################################### + TARGETS guifications-daemon-mpris LIBRARY + DESTINATION lib/guifications-daemon --- a/guifications-daemon-mpris/src/Makefile.am Fri Jan 08 17:24:43 2010 -0600
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,27 +0,0 @@
-gfdmprisdir=$(GFD_PLUGIN_DIR)-gfdmpris_LTLIBRARIES = guifications-daemon-mpris.la-guifications_daemon_mpris_la_SOURCES = \- guifications-daemon-mpris.c-guifications_daemon_mpris_la_LIBADD = \-guifications_daemon_mpris_la_LDFLAGS = -avoid-version -module-INCLUDES = -I$(top_srcdir)- -DDATADIR=\"$(datadir)\" \- -DLOCALEDIR=\"$(datadir)/locale\" \--- a/guifications-daemon-mpris/src/guifications-daemon-mpris.c Fri Jan 08 17:24:43 2010 -0600
+++ b/guifications-daemon-mpris/src/guifications-daemon-mpris.c Mon Dec 20 00:17:04 2010 -0600
@@ -19,10 +19,11 @@
#endif /* HAVE_CONFIG_H */
-#include <gflib/gf_lib.h>-#include <gflib/gf_intl.h> /******************************************************************************
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/guifications-daemon-web/CMakeLists.txt Mon Dec 20 00:17:04 2010 -0600
@@ -0,0 +1,75 @@
+cmake_minimum_required(VERSION 2.8) +############################################################################### +############################################################################### +project(guifications-daemon-web C) +set(GUIFICATION_DAEMON_WEB_MAJOR_VERSION 0) +set(GUIFICATION_DAEMON_WEB_MINOR_VERSION 0) +set(GUIFICATION_DAEMON_WEB_MICRO_VERSION 1) +set(GUIFICATION_DAEMON_WEB_EXTRA_VERSION dev) +set(VERSION ${GUIFICATIONS_DAEMON_WEB_MAJOR_VERSION}.${GUIFICATIONS_DAEMON_WEB_MINOR_VERSION}.${GUIFICATIONS_DAEMON_WEB_MICRO_VERSION}${GUIFICATIONS_DAEMON_WEB_EXTRA_VERSION}) +############################################################################### +############################################################################### +pkg_check_modules(GLIB REQUIRED +pkg_check_modules(GFLIB REQUIRED gflib) +pkg_check_modules(GUIFICATIONS_DAEMON REQUIRED guifications-daemon) +pkg_check_modules(GPLATE REQUIRED gplate) +pkg_check_modules(SOUP REQUIRED libsoup-2.4>=2.4.0) +############################################################################### +############################################################################### + -DGETTEXT_PACKAGE="guifications-daemon-web" + -DDATADIR="${CMAKE_INSTALL_PREFIX}/share" + -DLOCALEDIR="${CMAKE_INSTALL_PREFIX}/locale" +############################################################################### +############################################################################### +add_subdirectory(pixmaps) +add_subdirectory(themes) +############################################################################### +############################################################################### + FILES AUTHORS ChangeLog COPYING NEWS README + DESTINATION share/doc/guifications-daemon-web --- a/guifications-daemon-web/Makefile.am Fri Jan 08 17:24:43 2010 -0600
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,20 +0,0 @@
-SUBDIRS=pixmaps po src themes-libtool: $(LIBTOOL_DEPS)- $(SHELL) ./config.status --recheck--- a/guifications-daemon-web/autogen.sh Fri Jan 08 17:24:43 2010 -0600
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,30 +0,0 @@
-# Guifications - The end-all, be-all notification framework-# Copyright (C) 2003-2009 Gary Kramlich <grim@reaperworld.com>-# This program is free software: you can redistribute it and/or modify-# it under the terms of the GNU General Public License as published by-# the Free Software Foundation, either version 3 of the License, or-# (at your option) any later version.-# This program is distributed in the hope that it will be useful,-# but WITHOUT ANY WARRANTY; without even the implied warranty of-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the-# GNU General Public License for more details.-# You should have received a copy of the GNU General Public License-# along with this program. If not, see <http://www.gnu.org/licenses/>.-which gflib-autogen.sh || {- echo "You need to install gflib to run autogen"--- a/guifications-daemon-web/configure.ac Fri Jan 08 17:24:43 2010 -0600
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,161 +0,0 @@
-dnl Process this file with autoconf to create configure.-dnl ################################################################-dnl # Initialize autoconf-dnl ################################################################-AC_INIT(guifications-daemon-web, 0.0.1dev, guifications-devel@lists.guifications.org)-AC_CONFIG_SRCDIR(config.h.in)-AC_COPYRIGHT([Copyright 2003-2009 Gary Kramlich])-dnl ################################################################-dnl # Initialize automake-dnl ################################################################-AM_INIT_AUTOMAKE([gnu dist-bzip2])-dnl # disable the static library-dnl ################################################################-dnl # Configuration file-dnl ################################################################-AM_CONFIG_HEADER(config.h)-dnl # Stash configure args-AC_DEFINE_UNQUOTED(CONFIG_ARGS, "$ac_configure_args", [configure arguments])-dnl #######################################################################-dnl # Make sure we have pkg-config-dnl #######################################################################-dnl #######################################################################-dnl #######################################################################-LIBTOOL="$LIBTOOL --silent"-dnl #######################################################################-dnl #######################################################################-AH_TOP([ /* our header */-AC_MSG_CHECKING([for wasted cpu cycles])-dnl #######################################################################-dnl #######################################################################-GETTEXT_PACKAGE=guifications-web-AC_SUBST(GETTEXT_PACKAGE)-AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, ["$GETTEXT_PACKAGE"], [Define the gettext package to be used])-dnl #######################################################################-dnl # Look for the C compiler-dnl #######################################################################-AC_ARG_ENABLE(debug, [ --enable-debug compile with debugging support],,enable_debug=no)-if test x"$enable_debug" = x"yes" ; then- AC_DEFINE(DEBUG, 1, [Define if debugging is enabled.])-if test x"$GCC" = x"yes"; then- CFLAGS="$CFLAGS -Wall -g3"-dnl #######################################################################-dnl #######################################################################-PKG_CHECK_MODULES(GFLIB, gflib)-GFLIB_GENHEADER=`pkg-config --variable=gflib_genheader gflib`-AC_SUBST(GFLIB_GENHEADER)-dnl #######################################################################-dnl # check for gfd and grab it's plugin dir-dnl #######################################################################-PKG_CHECK_MODULES(GFD, guifications-daemon)-if test x"${prefix}" = x"NONE" ; then- GFD_PLUGIN_DIR=`pkg-config --variable=plugin_dir guifications-daemon`- GFD_PLUGIN_DIR="${prefix}/lib/guifications-daemon/"-AC_SUBST(GFD_PLUGIN_DIR)-dnl #######################################################################-dnl # check for glib and other glib dependencies-dnl #######################################################################-PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.14.0 gobject-2.0 >= 2.14.0)-PKG_CHECK_MODULES(GTHREAD, gthread-2.0 >= 2.14.0)-AC_SUBST(GTHREAD_CFLAGS)-dnl #######################################################################-dnl #######################################################################-PKG_CHECK_MODULES(GPLATE, gplate)-dnl #######################################################################-dnl #######################################################################-PKG_CHECK_MODULES(SOUP, libsoup-2.4 >= 2.4.0)-dnl #######################################################################-dnl #######################################################################- themes/default/Makefile-dnl #######################################################################-dnl #######################################################################-echo AC_PACKAGE_NAME AC_PACKAGE_VERSION Configuration complete-echo Debugging enabled....................: $enable_debug-echo guifications-daemon plugin directory.: $GFD_PLUGIN_DIR-echo Type make to compile--- a/guifications-daemon-web/pixmaps/Makefile.am Fri Jan 08 17:24:43 2010 -0600
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/guifications-daemon-web/src/CMakeLists.txt Mon Dec 20 00:17:04 2010 -0600
@@ -0,0 +1,38 @@
+############################################################################### +# guifications-daemon-web target +############################################################################### +set(GUIFICATIONS_DAEMON_WEB_HEADERS + guifications-daemon-web-handlers.h + guifications-daemon-web-theme.h +set(GUIFICATIONS_DAEMON_WEB_SOURCES + guifications-daemon-web.c + guifications-daemon-web-handler-debug.c + guifications-daemon-web-handler-feeds.c + guifications-daemon-web-handlers.c + guifications-daemon-web-theme.c +add_library(guifications-daemon-web MODULE + ${GUIFICATIONS_DAEMON_WEB_HEADERS} + ${GUIFICATIONS_DAEMON_WEB_SOURCES} +target_link_libraries(guifications-daemon-web +set_target_properties(guifications-daemon-web PROPERTIES PREFIX "") +############################################################################### +############################################################################### + TARGETS guifications-daemon-web LIBRARY + DESTINATION lib/guifications-daemon --- a/guifications-daemon-web/src/Makefile.am Fri Jan 08 17:24:43 2010 -0600
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,39 +0,0 @@
- guifications-daemon-web-handlers.h \- guifications-daemon-web-theme.h-gfdwebdir=$(GFD_PLUGIN_DIR)-gfdweb_LTLIBRARIES = guifications-daemon-web.la-guifications_daemon_web_la_SOURCES = \- guifications-daemon-web.c \- guifications-daemon-web-handler-debug.c \- guifications-daemon-web-handler-feeds.c \- guifications-daemon-web-handlers.c \- guifications-daemon-web-theme.c-guifications_daemon_web_la_LIBADD = \-guifications_daemon_web_la_LDFLAGS = -avoid-version -module-INCLUDES = -I$(top_srcdir)- -DDATADIR=\"$(datadir)\" \- -DLIBDIR=\"$(libdir)\" \- -DLOCALEDIR=\"$(datadir)/locale\" \--- a/guifications-daemon-web/src/guifications-daemon-web-handlers.h Fri Jan 08 17:24:43 2010 -0600
+++ b/guifications-daemon-web/src/guifications-daemon-web-handlers.h Mon Dec 20 00:17:04 2010 -0600
@@ -20,7 +20,7 @@
-#include <gflib/gf_lib.h> #include <gplate/gplate.h>
--- a/guifications-daemon-web/src/guifications-daemon-web.c Fri Jan 08 17:24:43 2010 -0600
+++ b/guifications-daemon-web/src/guifications-daemon-web.c Mon Dec 20 00:17:04 2010 -0600
@@ -19,7 +19,7 @@
#endif /* HAVE_CONFIG_H */
-#include <gflib/gf_lib.h> #include <gflib/gf_intl.h>
#include <libsoup/soup.h>
@@ -86,8 +86,9 @@
static GfPluginInfo info = {
GF_NATIVE_PLUGIN_ABI_VERSION,
+ "Guifications Web Interface", N_("Web Interface for Guifications"),
N_("This is a daemon plugin for monitoring via a web browser"),
"Gary Kramlich <grim@reaperworld.com>",
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/guifications-daemon-web/themes/CMakeLists.txt Mon Dec 20 00:17:04 2010 -0600
@@ -0,0 +1,2 @@
+add_subdirectory(default) --- a/guifications-daemon-web/themes/Makefile.am Fri Jan 08 17:24:43 2010 -0600
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/guifications-daemon-web/themes/default/CMakeLists.txt Mon Dec 20 00:17:04 2010 -0600
@@ -0,0 +1,14 @@
+ install(FILES ${PAGE} DESTINATION share/guifications-daemon/web/themes/default) --- a/guifications-daemon-web/themes/default/Makefile.am Fri Jan 08 17:24:43 2010 -0600
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-EXTRA_DIST=$(DEFAULT_THEME)-default_DATA=$(DEFAULT_THEME)-defaultdir=$(datadir)/guifications-daemon/web/themes/default/--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/guifications-daemon/CMakeLists.txt Mon Dec 20 00:17:04 2010 -0600
@@ -0,0 +1,14 @@
+cmake_minimum_required(VERSION 2.8) +GFLIB_PROJECT(guifications-daemon 0 0 1 dev) +configure_file(guifications-daemon.pc.in guifications-daemon.pc @ONLY) + FILES ${CMAKE_CURRENT_BINARY_DIR}/guifications-daemon.pc + DESTINATION lib/pkgconfig --- a/guifications-daemon/Makefile.am Fri Jan 08 17:24:43 2010 -0600
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,30 +0,0 @@
- guifications-daemon.conf \- guifications-daemon.service \- guifications-daemon.service.in-CLEANFILES = guifications-daemon.service-pcdata_DATA=guifications-daemon.pc-pcdatadir=$(libdir)/pkgconfig-libtool: $(LIBTOOL_DEPS)- $(SHELL) ./config.status --recheck--- a/guifications-daemon/autogen.sh Fri Jan 08 17:24:43 2010 -0600
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,30 +0,0 @@
-# Guifications - The end-all, be-all notification framework-# Copyright (C) 2003-2009 Gary Kramlich <grim@reaperworld.com>-# This program is free software: you can redistribute it and/or modify-# it under the terms of the GNU General Public License as published by-# the Free Software Foundation, either version 3 of the License, or-# (at your option) any later version.-# This program is distributed in the hope that it will be useful,-# but WITHOUT ANY WARRANTY; without even the implied warranty of-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the-# GNU General Public License for more details.-# You should have received a copy of the GNU General Public License-# along with this program. If not, see <http://www.gnu.org/licenses/>.-which gflib-autogen.sh || {- echo "You need to install gflib to run autogen"--- a/guifications-daemon/configure.ac Fri Jan 08 17:24:43 2010 -0600
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,123 +0,0 @@
-dnl Process this file with autoconf to create configure.-dnl ################################################################-dnl # Initialize autoconf-dnl ################################################################-AC_INIT(guifications-daemon, 0.0.1dev, guifications-devel@lists.guifications.org)-AC_CONFIG_SRCDIR(config.h.in)-AC_COPYRIGHT([Copyright 2003-2009 Gary Kramlich])-dnl ################################################################-dnl # Initialize automake-dnl ################################################################-AM_INIT_AUTOMAKE([gnu dist-bzip2])-dnl ################################################################-dnl # Configuration file-dnl ################################################################-AM_CONFIG_HEADER(config.h)-dnl # Stash configure args-AC_DEFINE_UNQUOTED(CONFIG_ARGS, "$ac_configure_args", [configure arguments])-AC_MSG_CHECKING([PEBKAC])-dnl #######################################################################-dnl #######################################################################-LIBTOOL="$LIBTOOL --silent"-dnl #######################################################################-dnl #######################################################################-AH_TOP([ /* our header */-dnl #######################################################################-dnl #######################################################################-GETTEXT_PACKAGE=guifications-daemon-AC_SUBST(GETTEXT_PACKAGE)-AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, ["$GETTEXT_PACKAGE"], [Define the gettext package to be used])-dnl #######################################################################-dnl # Check for some headers-dnl #######################################################################-AC_CHECK_HEADERS(signal.h)-dnl #######################################################################-dnl # Check for pkg-config-dnl #######################################################################-AC_PATH_PROG(PKG_CONFIG, pkg-config)-dnl #######################################################################-dnl # Look for the C compiler-dnl #######################################################################- AC_HELP_STRING([--enable-debug],[compile with debugging support])-if test x"$enable_debug" = x"yes" ; then- AC_DEFINE(DEBUG, 1, [Define if debugging is enabled.])-if test x"$GCC" = x"yes"; then- CFLAGS="$CFLAGS -Wall -g3"-dnl #######################################################################-dnl # check for glib and other glib dependencies-dnl #######################################################################-PKG_CHECK_MODULES(GLIB, [glib-2.0 >= 2.12.0 gobject-2.0 >= 2.12.0])-dnl #######################################################################-dnl #######################################################################-PKG_CHECK_MODULES(GFLIB, [gflib])-dnl #######################################################################-dnl #######################################################################-dnl #######################################################################-dnl #######################################################################-echo AC_PACKAGE_NAME AC_PACKAGE_VERSION Configuration complete-echo Debugging enabled................: $enable_debug-echo Type make to compile--- a/guifications-daemon/guifications-daemon.pc.in Fri Jan 08 17:24:43 2010 -0600
+++ b/guifications-daemon/guifications-daemon.pc.in Mon Dec 20 00:17:04 2010 -0600
@@ -1,4 +1,4 @@
+prefix=@CMAKE_INSTALL_PREFIX@ libdir=${exec_prefix}/lib
includedir=${prefix}/include/gflib-1.0
--- a/guifications-daemon/m4/Makefile.am Fri Jan 08 17:24:43 2010 -0600
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-EXTRA_DIST=as_ac_expand.m4--- a/guifications-daemon/m4/as_ac_expand.m4 Fri Jan 08 17:24:43 2010 -0600
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,40 +0,0 @@
-dnl AS_AC_EXPAND(VAR, CONFIGURE_VAR)-dnl AS_AC_EXPAND(SYSCONFDIR, $sysconfdir)-dnl will set SYSCONFDIR to /usr/local/etc if prefix=/usr/local-AC_DEFUN([AS_AC_EXPAND],- dnl first expand prefix and exec_prefix if necessary- exec_prefix_save=$exec_prefix- dnl if no prefix given, then use /usr/local, the default prefix- if test "x$prefix" = "xNONE"; then- prefix=$ac_default_prefix- dnl if no exec_prefix given, then use prefix- if test "x$exec_prefix" = "xNONE"; then- dnl loop until it doesn't change anymore- new_full_var="`eval echo $full_var`"- if test "x$new_full_var"="x$full_var"; then break; fi- AC_SUBST([$1], "$full_var")- dnl restore prefix and exec_prefix- exec_prefix=$exec_prefix_save--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/guifications-daemon/src/CMakeLists.txt Mon Dec 20 00:17:04 2010 -0600
@@ -0,0 +1,28 @@
+############################################################################### +# guifications-daemon target +############################################################################### +set(GUIFICATIONS_DAEMON_HEADERS + guifications-daemon-connections.h + guifications-daemon-feed-manager.h + guifications-daemon-signals.h +add_executable(guifications-daemon + ${GUIFICATIONS_DAEMON_HEADERS} + guifications-daemon-connections.c + guifications-daemon-feed-manager.c + guifications-daemon-signals.c +target_link_libraries(guifications-daemon +############################################################################### +############################################################################### +install(TARGETS guifications-daemon RUNTIME DESTINATION bin) --- a/guifications-daemon/src/Makefile.am Fri Jan 08 17:24:43 2010 -0600
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,26 +0,0 @@
- guifications-daemon.h \- guifications-daemon-connections.h \- guifications-daemon-feed-manager.h \- guifications-daemon-signals.h-bin_PROGRAMS = guifications-daemon-guifications_daemon_SOURCES = \- guifications-daemon.c \- guifications-daemon-connections.c \- guifications-daemon-feed-manager.c \- guifications-daemon-signals.c-guifications_daemon_LDADD = \-INCLUDES = -I$(top_srcdir)- -DLIBDIR=\"$(libdir)\" \--- a/guifications-daemon/src/guifications-daemon-connections.h Fri Jan 08 17:24:43 2010 -0600
+++ b/guifications-daemon/src/guifications-daemon-connections.h Mon Dec 20 00:17:04 2010 -0600
@@ -18,7 +18,7 @@
#ifndef GFD_CONNECTIONS_H
#define GFD_CONNECTIONS_H
-#include <gflib/gf_lib.h>--- a/guifications-daemon/src/guifications-daemon-feed-manager.h Fri Jan 08 17:24:43 2010 -0600
+++ b/guifications-daemon/src/guifications-daemon-feed-manager.h Mon Dec 20 00:17:04 2010 -0600
@@ -18,7 +18,7 @@
#ifndef GFD_FEED_MANAGER_H
#define GFD_FEED_MANAGER_H
-#include <gflib/gf_lib.h>--- a/guifications-daemon/src/guifications-daemon-signals.c Fri Jan 08 17:24:43 2010 -0600
+++ b/guifications-daemon/src/guifications-daemon-signals.c Mon Dec 20 00:17:04 2010 -0600
@@ -26,7 +26,7 @@
-#include <gflib/gf_lib.h> #include "guifications-daemon.h"
#include "guifications-daemon-connections.h"
--- a/guifications-daemon/src/guifications-daemon.c Fri Jan 08 17:24:43 2010 -0600
+++ b/guifications-daemon/src/guifications-daemon.c Mon Dec 20 00:17:04 2010 -0600
@@ -21,7 +21,7 @@
-#include <gflib/gf_lib.h> #include "guifications-daemon-connections.h"
#include "guifications-daemon-feed-manager.h"
--- a/guifications-daemon/src/guifications-daemon.h Fri Jan 08 17:24:43 2010 -0600
+++ b/guifications-daemon/src/guifications-daemon.h Mon Dec 20 00:17:04 2010 -0600
@@ -18,8 +18,6 @@
-#include <gflib/gf_lib.h>--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/guifications-gtk/CMakeLists.txt Mon Dec 20 00:17:04 2010 -0600
@@ -0,0 +1,27 @@
+cmake_minimum_required(VERSION 2.8) +GFLIB_PROJECT(guifications-gtk 0 0 1 dev) +pkg_check_modules(GTK REQUIRED gtk+-2.0>=2.16.0) +pkg_check_modules(GFLIB_UI REQUIRED gflib-ui) +pkg_check_modules(GFLIB_GTK REQUIRED gflib-gtk) + ${GFLIB_UI_INCLUDE_DIRS} + ${GFLIB_GTK_INCLUDE_DIRS} + ${GFLIB_UI_LIBRARY_DIRS} + ${GFLIB_GTK_LIBRARY_DIRS} +add_subdirectory(pixmaps) --- a/guifications-gtk/Makefile.am Fri Jan 08 17:24:43 2010 -0600
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,16 +0,0 @@
-SUBDIRS = pixmaps po src-libtool: $(LIBTOOL_DEPS)- $(SHELL) ./config.status --recheck--- a/guifications-gtk/autogen.sh Fri Jan 08 17:24:43 2010 -0600
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,30 +0,0 @@
-# Guifications - The end-all, be-all notification framework-# Copyright (C) 2003-2009 Gary Kramlich <grim@reaperworld.com>-# This program is free software: you can redistribute it and/or modify-# it under the terms of the GNU General Public License as published by-# the Free Software Foundation, either version 3 of the License, or-# (at your option) any later version.-# This program is distributed in the hope that it will be useful,-# but WITHOUT ANY WARRANTY; without even the implied warranty of-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the-# GNU General Public License for more details.-# You should have received a copy of the GNU General Public License-# along with this program. If not, see <http://www.gnu.org/licenses/>.-PACKAGE="guifications-gtk"-which gflib-autogen.sh || {- echo "You need to install gflib to run autogen"--- a/guifications-gtk/configure.ac Fri Jan 08 17:24:43 2010 -0600
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,132 +0,0 @@
-dnl Process this file with autoconf to create configure.-dnl ################################################################-dnl # Initialize autoconf-dnl ################################################################-AC_INIT(guifications-gtk, 0.0.1dev, guifications-devel@lists.guifications.org)-AC_CONFIG_SRCDIR(config.h.in)-AC_COPYRIGHT([Copyright 2003-2009 Gary Kramlich])-dnl ################################################################-dnl # Initialize automake-dnl ################################################################-AM_INIT_AUTOMAKE([gnu dist-bzip2])-dnl ################################################################-dnl # Configuration file-dnl ################################################################-AM_CONFIG_HEADER(config.h)-dnl # Stash configure args-AC_DEFINE_UNQUOTED(CONFIG_ARGS, "$ac_configure_args", [configure arguments])-dnl #######################################################################-dnl # Make sure we have pkg-config-dnl #######################################################################-dnl #######################################################################-dnl #######################################################################-LIBTOOL="$LIBTOOL --silent"-dnl #######################################################################-dnl # I'm lazy and figured config.h is the best place for this ;)-dnl #######################################################################-AC_DEFINE_UNQUOTED(GFLIB_WEBSITE, "http://guifications.org/", [gflib website])-dnl #######################################################################-dnl #######################################################################-AH_TOP([ /* our header */-dnl #######################################################################-dnl #######################################################################-GETTEXT_PACKAGE=guifications-gtk-AC_SUBST(GETTEXT_PACKAGE)-AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, ["$GETTEXT_PACKAGE"], [Define the gettext package to be used])-dnl #######################################################################-dnl # Look for the C compiler-dnl #######################################################################- AC_HELP_STRING([--enable-debug],[compile with debugging support])-if test x"$enable_debug" = x"yes" ; then- AC_DEFINE(DEBUG, 1, [Define if debugging is enabled.])-if test x"$GCC" = x"yes"; then- CFLAGS="$CFLAGS -Wall -g3"-dnl #######################################################################-dnl #######################################################################-PKG_CHECK_MODULES(GFLIB, gflib)-AC_MSG_CHECKING([loch ness monster])-AC_MSG_RESULT([yes, er, wait, no...])-PKG_CHECK_MODULES(GFLIB_GTK, gflib-gtk)-AC_SUBST(GFLIB_GTK_CFLAGS)-AC_SUBST(GFLIB_GTK_LIBS)-dnl #######################################################################-dnl # check for glib and other glib dependencies-dnl #######################################################################-PKG_CHECK_MODULES(GLIB, [glib-2.0 >= 2.12.0 gobject-2.0 >= 2.12.0])-PKG_CHECK_MODULES(GTK, gtk+-2.0)-dnl #######################################################################-dnl #######################################################################-dnl #######################################################################-dnl #######################################################################-echo AC_PACKAGE_NAME AC_PACKAGE_VERSION Configuration complete-echo Debugging enabled................: $enable_debug-echo Type make to compile--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/guifications-gtk/pixmaps/CMakeLists.txt Mon Dec 20 00:17:04 2010 -0600
@@ -0,0 +1,11 @@
+foreach(PIXMAP ${PIXMAPS}) + FILES ${CMAKE_CURRENT_SOURCE_DIR}/${PIXMAP} + DESTINATION share/guifications-gtk --- a/guifications-gtk/pixmaps/Makefile.am Fri Jan 08 17:24:43 2010 -0600
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,5 +0,0 @@
-pixmapdir=$(datadir)/pixmaps/guifications/gtk-pixmap_DATA=tray_icon.png--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/guifications-gtk/src/CMakeLists.txt Mon Dec 20 00:17:04 2010 -0600
@@ -0,0 +1,35 @@
+############################################################################### +# guifications-gtk target +############################################################################### +set(GUIFICATIONS_GTK_HEADERS +set(GUIFICATIONS_GTK_SOURCES +add_executable(guifications-gtk + ${GUIFICATIONS_GTK_HEADERS} + ${GUIFICATIONS_GTK_SOURCES} +target_link_libraries(guifications-gtk +############################################################################### +############################################################################### +install(TARGETS guifications-gtk RUNTIME DESTINATION bin) --- a/guifications-gtk/src/gf_gtk_feeds.h Fri Jan 08 17:24:43 2010 -0600
+++ b/guifications-gtk/src/gf_gtk_feeds.h Mon Dec 20 00:17:04 2010 -0600
@@ -18,8 +18,8 @@
-#include <gflib/gf_lib.h>-#include <gflib-gtk/gf_lib_gtk.h>--- a/guifications-gtk/src/gf_gtk_icon.h Fri Jan 08 17:24:43 2010 -0600
+++ b/guifications-gtk/src/gf_gtk_icon.h Mon Dec 20 00:17:04 2010 -0600
@@ -18,7 +18,7 @@
-#include <gflib-gtk/gf_lib_gtk.h>--- a/guifications-gtk/src/gf_gtk_intl.h Fri Jan 08 17:24:43 2010 -0600
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,41 +0,0 @@
- * Guifications - The end-all, be-all notification framework- * Copyright (C) 2003-2009 Gary Kramlich <grim@reaperworld.com>- * This program is free software: you can redistribute it and/or modify- * it under the terms of the GNU General Public License as published by- * the Free Software Foundation, either version 3 of the License, or- * (at your option) any later version.- * This program is distributed in the hope that it will be useful,- * but WITHOUT ANY WARRANTY; without even the implied warranty of- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the- * GNU General Public License for more details.- * You should have received a copy of the GNU General Public License- * along with this program. If not, see <http://www.gnu.org/licenses/>.-# define _(x) dgettext(PACKAGE, x)-# define N_(String) dgettext_noop (PACKAGE, String)-# define N_(String) (String)-# define N_(String) (String)-# define ngettext(Singular, Plural, Number) ((Number == 1) ? (Singular) : (Plural))-#endif /* GF_GTK_INTL_H */--- a/guifications-gtk/src/gf_gtk_prefs.h Fri Jan 08 17:24:43 2010 -0600
+++ b/guifications-gtk/src/gf_gtk_prefs.h Mon Dec 20 00:17:04 2010 -0600
@@ -18,8 +18,8 @@
-#include <gflib/gf_lib.h>-#include <gflib-gtk/gf_lib_gtk.h>--- a/guifications-gtk/src/guifications-gtk.c Fri Jan 08 17:24:43 2010 -0600
+++ b/guifications-gtk/src/guifications-gtk.c Mon Dec 20 00:17:04 2010 -0600
@@ -23,7 +23,6 @@
#include "gf_gtk_feeds.h"
-#include "gf_gtk_intl.h" #include "gf_gtk_prefs.h"
--- a/guifications-gtk/src/guifications-gtk.h Fri Jan 08 17:24:43 2010 -0600
+++ b/guifications-gtk/src/guifications-gtk.h Mon Dec 20 00:17:04 2010 -0600
@@ -18,8 +18,8 @@
-#include <gflib/gf_lib.h>-#include <gflib-gtk/gf_lib_gtk.h>@@ -28,3 +28,4 @@
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/purple-guifications/CMakeLists.txt Mon Dec 20 00:17:04 2010 -0600
@@ -0,0 +1,68 @@
+cmake_minimum_required(VERSION 2.8) +############################################################################### +############################################################################### +project(purple-guifications C) +set(PURPLE_GUIFICATIONS_MAJOR_VERSION 0) +set(PURPLE_GUIFICATIONS_MINOR_VERSION 0) +set(PURPLE_GUIFICATIONS_MICRO_VERSION 1) +set(PURPLE_GUIFICATIONS_EXTRA_VERSION dev) +set(VERSION ${PURPLE_GUIFICATIONS_MAJOR_VERSION}.${PURPLE_GUIFICATIONS_MINOR_VERSION}.${PURPLE_GUIFICATIONS_MICRO_VERSION}${PURPLE_GUIFICATIONS_EXTRA_VERSION}) +############################################################################### +############################################################################### +pkg_check_modules(GLIB REQUIRED +pkg_check_modules(GFLIB REQUIRED gflib) +pkg_check_modules(PURPLE REQUIRED purple) +############################################################################### +############################################################################### + -DGETTEXT_PACKAGE="purple-guifications" + -DDATADIR="${CMAKE_INSTALL_PREFIX}/share" + -DLOCALEDIR="${CMAKE_INSTALL_PREFIX}/locale" +############################################################################### +############################################################################### +add_subdirectory(pixmaps) +############################################################################### +############################################################################### + FILES AUTHORS ChangeLog COPYING NEWS README + DESTINATION share/doc/purple-guifications --- a/purple-guifications/Makefile.am Fri Jan 08 17:24:43 2010 -0600
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,34 +0,0 @@
-SUBDIRS = pixmaps po src-BUILT_SOURCES=gf_config.h-$(OBJECTS): libtool $(BUILD_SOURCES)-libtool: $(LIBTOOL_DEPS)- $(SHELL) ./config.status --recheck-gf_config.h: pre_config.h- cp -f po/Makefile po/.tmp-Makefile- sed -e "s#localedir = .*#localedir = $(GAIM_DATADIR)/locale#g" < po/.tmp-Makefile > po/Makefile- $(sedpath) 's/\#define PACKAGE/\#define GF_PACKAGE/g' pre_config.h > $@--- a/purple-guifications/autogen.sh Fri Jan 08 17:24:43 2010 -0600
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,30 +0,0 @@
-# Guifications - The end-all, be-all notification framework-# Copyright (C) 2003-2009 Gary Kramlich <grim@reaperworld.com>-# This program is free software: you can redistribute it and/or modify-# it under the terms of the GNU General Public License as published by-# the Free Software Foundation, either version 3 of the License, or-# (at your option) any later version.-# This program is distributed in the hope that it will be useful,-# but WITHOUT ANY WARRANTY; without even the implied warranty of-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the-# GNU General Public License for more details.-# You should have received a copy of the GNU General Public License-# along with this program. If not, see <http://www.gnu.org/licenses/>.-PACKAGE="purple-guifications"-which gflib-autogen.sh || {- echo "You need to install gflib to run autogen"--- a/purple-guifications/configure.ac Fri Jan 08 17:24:43 2010 -0600
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,144 +0,0 @@
-dnl Process this file with autoconf to create configure.-dnl ################################################################-dnl # Initialize autoconf-dnl ################################################################-AC_INIT(purple-guifications, 3.0.0dev, guifications-devel@lists.guifications.org)-AC_COPYRIGHT([Copyright 2003-2009 Gary Kramlich])-dnl ################################################################-dnl # Initialize automake-dnl ################################################################-AM_INIT_AUTOMAKE([gnu dist-bzip2])-AC_PATH_PROG(sedpath, sed)-dnl ################################################################-dnl # Configuration file-dnl ################################################################-AM_CONFIG_HEADER(config.h)-dnl # Stash configure args-AC_DEFINE_UNQUOTED(CONFIG_ARGS, "$ac_configure_args", [configure arguments])-dnl #######################################################################-dnl # Make sure we have pkg-config-dnl #######################################################################-dnl #######################################################################-dnl #######################################################################-LIBTOOL="$LIBTOOL --silent"-dnl #######################################################################-dnl # I'm lazy and figured config.h is the best place for this ;)-dnl #######################################################################-AC_DEFINE_UNQUOTED(GUIFICATIONS_WEBSITE, "http://guifications.org/", [guifications website])-dnl #######################################################################-dnl #######################################################################-AH_TOP([ /* our header */-dnl #######################################################################-dnl #######################################################################-GETTEXT_PACKAGE=purple-guifications-AC_SUBST(GETTEXT_PACKAGE)-AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, ["$GETTEXT_PACKAGE"], [Define the gettext package to be used])-dnl #######################################################################-dnl # Look for the C compiler-dnl #######################################################################-AC_MSG_CHECKING([WMD's])- AC_HELP_STRING([--enable-debug],[compile with debugging support])-if test x"$enable_debug" = x"yes" ; then- AC_DEFINE(DEBUG, 1, [Define if debugging is enabled.])-if test x"$GCC" = x"yes"; then- CFLAGS="$CFLAGS -Wall -g3"-dnl #######################################################################-dnl # check for glib and other glib dependencies-dnl #######################################################################-PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.14.0)-dnl #######################################################################-dnl # check for libpurple-dnl #######################################################################-PKG_CHECK_MODULES(PURPLE, purple)-if test x"$prefix" = x"NONE" ; then- dnl # when no prefix is given, we grab the purple lib and data directories- dnl # and use those instead. If a prefix was given, we just use that.- PURPLE_LIBDIR=`pkg-config --variable=libdir purple`-PURPLE_LIBDIR="$PURPLE_LIBDIR/purple-2/"-dnl #######################################################################-dnl # check for gflib goodies-dnl #######################################################################-PKG_CHECK_MODULES(GFLIB, gflib)-dnl #######################################################################-dnl #######################################################################-dnl #######################################################################-dnl #######################################################################-echo AC_PACKAGE_NAME AC_PACKAGE_VERSION Configuration complete-echo Installing to....................: $PURPLE_LIBDIR-echo Debugging enabled................: $enable_debug-echo Type make to compile--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/purple-guifications/pixmaps/CMakeLists.txt Mon Dec 20 00:17:04 2010 -0600
@@ -0,0 +1,8 @@
+foreach(PIXMAP ${PIXMAPS}) + install(FILES ${PIXMAP} DESTINATION share/pixmaps/purple-guifications) --- a/purple-guifications/pixmaps/Makefile.am Fri Jan 08 17:24:43 2010 -0600
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,4 +0,0 @@
-pixmapdir=$(datadir)/pixmaps/guifications/purple--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/purple-guifications/src/CMakeLists.txt Mon Dec 20 00:17:04 2010 -0600
@@ -0,0 +1,33 @@
+############################################################################### +# purple-guifications target +############################################################################### +set(PURPLE_GUIFICATIONS_HEADERS +set(PURPLE_GUIFICATIONS_SOURCES +add_library(purple-guifications MODULE + ${PURPLE_GUIFICATIONS_HEADERS} + ${PURPLE_GUIFICATIONS_SOURCES} +target_link_libraries(purple-guifications +set_target_properties(purple-guifications PROPERTIES PREFIX "") +############################################################################### +############################################################################### + TARGETS purple-guifications LIBRARY --- a/purple-guifications/src/Makefile.am Fri Jan 08 17:24:43 2010 -0600
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,27 +0,0 @@
-gf_LTLIBRARIES=guifications3.la-guifications3_la_LDFLAGS=-module -avoid-version-guifications3_la_SOURCES=\-guifications3_la_LIBADD=\- -DGF_VERSION=\"$(VERSION)\" \- -DDATADIR=\"$(datadir)\" \- -DLOCALEDIR=\"$(datadir)/locale\" \--- a/purple-guifications/src/events.c Fri Jan 08 17:24:43 2010 -0600
+++ b/purple-guifications/src/events.c Mon Dec 20 00:17:04 2010 -0600
@@ -19,8 +19,7 @@
-#include <gflib/gf_lib.h>-#include <gflib/gf_intl.h> #define add_event(feed, name, i18n, desc) { \
event = gf_event_new((name), (i18n), (desc)); \
--- a/purple-guifications/src/events.h Fri Jan 08 17:24:43 2010 -0600
+++ b/purple-guifications/src/events.h Mon Dec 20 00:17:04 2010 -0600
@@ -20,7 +20,7 @@
-#include <gflib/gf_lib.h>--- a/purple-guifications/src/purple-guifications.c Fri Jan 08 17:24:43 2010 -0600
+++ b/purple-guifications/src/purple-guifications.c Mon Dec 20 00:17:04 2010 -0600
@@ -21,7 +21,7 @@
-#include <gflib/gf_lib.h>@@ -35,6 +35,12 @@
+/* undefine _ and N_ from gf_intl.h. This needs to be fixed in gf_lib.h to not + * include gf_intl.h or something... @@ -180,12 +186,12 @@
"Gary Kramlich <grim@reaperworld.com>",
+ "https://www.guifications.org/projects/guifications3/",
