[gnome-panel/merge-gnome-applets] Fix mini-commander applet build

From: Alberts Muktupāvels <muktupavels src gnome org>
To: commits-list gnome org
Cc:
Subject: [gnome-panel/merge-gnome-applets] Fix mini-commander applet build
Date: Tue, 27 May 2014 21:26:25 +0000 (UTC)
commit 410f0317639d8472ad378c3032e0150706abb7c8
Author: Alberts Muktupāvels <alberts muktupavels gmail com>
Date:   Wed May 28 00:26:09 2014 +0300

    Fix mini-commander applet build

 applets/Makefile.am                      |    1 +
 applets/mini-commander/src/Makefile.am   |   12 ++++++++----
 applets/mini-commander/src/preferences.c |    3 ++-
 configure.ac                             |   13 ++++++++++++-
 gnome-applets/Makefile.am                |    1 -
 gnome-applets/configure.ac               |   21 ---------------------
 6 files changed, 23 insertions(+), 28 deletions(-)
---
diff --git a/applets/Makefile.am b/applets/Makefile.am
index cf3b3a5..e0c2e69 100644
--- a/applets/Makefile.am
+++ b/applets/Makefile.am
@@ -4,6 +4,7 @@ SUBDIRS =                       \
        drivemount \
        fish                    \
        geyes \
+       mini-commander \
        notification_area       \
        wncklet
 
diff --git a/applets/mini-commander/src/Makefile.am b/applets/mini-commander/src/Makefile.am
index 23e1d93..054432c 100644
--- a/applets/mini-commander/src/Makefile.am
+++ b/applets/mini-commander/src/Makefile.am
@@ -3,8 +3,11 @@
 AM_CPPFLAGS =                          \
        -I.                             \
        -I$(srcdir)                     \
+       -I$(srcdir)/../../../libpanel-applet \
+       -I$(top_builddir)/libpanel-applet \
+       -DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
        -DMC_MENU_UI_DIR=\""$(uidir)"\" \
-       $(GNOME_APPLETS_CFLAGS) \
+       $(LIBPANEL_APPLET_CFLAGS)       \
        $(WARN_CFLAGS)                  \
        $(GNOME_INCLUDEDIR)
 
@@ -35,14 +38,15 @@ mini_commander_applet_SOURCES =                     \
        mc-default-macros.h
 
 mini_commander_applet_LDADD =  \
-       $(GNOME_APPLETS_LIBS)
+       $(GCONF_LIBS)
 
 mc_install_default_macros_SOURCES =    \
        mc-install-default-macros.c     \
        mc-default-macros.h
 
 mc_install_default_macros_LDADD =      \
-       $(GNOME_APPLETS_LIBS)
+       ../../../libpanel-applet/libpanel-applet-4.la \
+       $(LIBPANEL_APPLET_LIBS)
 
 builder_DATA = mini-commander.ui
 
@@ -100,7 +104,7 @@ ui_DATA = mini-commander-applet-menu.xml
 if GCONF_SCHEMAS_INSTALL
 install-data-local:
        GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule 
$(schemas_DATA) ;
-       GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) 
$(top_builddir)/mini-commander/src/mc-install-default-macros
+       GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) 
$(top_builddir)/applets/mini-commander/src/mc-install-default-macros
 endif
 
 EXTRA_DIST =                                                           \
diff --git a/applets/mini-commander/src/preferences.c b/applets/mini-commander/src/preferences.c
index 138b473..bf24be7 100644
--- a/applets/mini-commander/src/preferences.c
+++ b/applets/mini-commander/src/preferences.c
@@ -415,7 +415,8 @@ add_response (GtkWidget *window,
                                                   GTK_DIALOG_DESTROY_WITH_PARENT,
                                                   GTK_MESSAGE_ERROR,
                                                   GTK_BUTTONS_OK,
-                                                  error_message);
+                                                  error_message,
+                                                  NULL);
 
            g_signal_connect (error_dialog, "response", G_CALLBACK (gtk_widget_destroy), NULL);
            gtk_window_set_resizable (GTK_WINDOW (error_dialog), FALSE);
diff --git a/configure.ac b/configure.ac
index 08489fa..c7680a4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -71,7 +71,7 @@ PANGO_REQUIRED=1.15.4
 GLIB_REQUIRED=2.35.0
 GTK_REQUIRED=3.3.8
 LIBWNCK_REQUIRED=3.4.6
-GCONF_REQUIRED=2.6.1
+GCONF_REQUIRED=2.8.0
 LIBGNOME_MENU_REQUIRED=3.1.4
 TELEPATHY_GLIB_REQUIRED=0.14.0
 LIBECAL_REQUIRED=3.5.3
@@ -603,6 +603,13 @@ AM_CONDITIONAL(NEED_LIBAPM, test "x$NEED_LIBAPM" = "xyes")
 AM_CONDITIONAL(BUILD_BATTSTAT_APPLET, test x$build_battstat_applet = xyes)
 
 dnl ***************************************************************************
+dnl *** Mini-Commander specific checks                                      ***
+dnl ***************************************************************************
+AC_ARG_ENABLE(mini-commander, [  --enable-mini-commander build mini-commander
+                          [@<:@default: no, transparent upgrade to deskbar-applet@:>@]], 
enable_mini_commander="yes", enable_mini_commander="no")
+AM_CONDITIONAL(BUILD_MINICOMMANDER_APPLET, test "x$enable_mini_commander" = "xyes")
+
+dnl ***************************************************************************
 dnl *** invest-applet specific checks                                       ***
 dnl ***************************************************************************
 
@@ -693,6 +700,9 @@ applets/invest-applet/help/Makefile
 applets/invest-applet/invest/defs.py
 applets/invest-applet/invest/Makefile
 applets/invest-applet/Makefile
+applets/mini-commander/help/Makefile
+applets/mini-commander/Makefile
+applets/mini-commander/src/Makefile
 applets/notification_area/Makefile
 applets/wncklet/Makefile
 doc/Makefile
@@ -760,6 +770,7 @@ echo "
              - geyes                   always
              - gweather                $build_libgweather_applets
              - invest-applet           $HAVE_PYGOBJECT
+             - mini-commander          $enable_mini_commander
 
             Using DBUS:                $HAVE_DBUS
             Using NetworkManager:      $HAVE_NETWORKMANAGER
diff --git a/gnome-applets/Makefile.am b/gnome-applets/Makefile.am
index f17d543..334207f 100644
--- a/gnome-applets/Makefile.am
+++ b/gnome-applets/Makefile.am
@@ -15,7 +15,6 @@ mixer_applet_SUBDIR = mixer
 endif
 
 always_built_SUBDIRS =  \
-       mini-commander  \
        stickynotes     \
        trashapplet     \
        null_applet
diff --git a/gnome-applets/configure.ac b/gnome-applets/configure.ac
index b325a20..6bc06ac 100644
--- a/gnome-applets/configure.ac
+++ b/gnome-applets/configure.ac
@@ -15,7 +15,6 @@ dnl ***************************************************************************
 GTK_REQUIRED=3.0
 GLIB_REQUIRED=2.22.0
 GIO_REQUIRED=2.15.3
-GCONF_REQUIRED=2.8.0
 LIBPANEL_REQUIRED=2.91.90
 LIBGTOP_REQUIRED=2.11.92
 LIBXKLAVIER_REQUIRED=4.0
@@ -179,15 +178,6 @@ if test x"$GDK_PIXBUF_CSOURCE" = xno; then
 fi
 AC_SUBST(GDK_PIXBUF_CSOURCE)
 
-dnl -- glib-genmarshal --------------------------------------------------------
-AC_PATH_PROG(GLIB_GENMARSHAL, glib-genmarshal)
-
-dnl -- gconftool-2 ------------------------------------------------------------
-AC_PATH_PROG(GCONFTOOL, gconftool-2, no)
-if test x"$GCONFTOOL" = xno; then
-  AC_MSG_ERROR([gconftool-2 executable not found in your path - should be installed with GConf])
-fi
-
 dnl -- xsltproc ---------------------------------------------------------------
 AC_PATH_PROG(XSLTPROC, xsltproc, no)
 if test x"$XSLTPROC" = xno; then
@@ -239,13 +229,6 @@ esac
 AM_CONDITIONAL(GKB_SUN, $gkb_type_sun)
 
 dnl ***************************************************************************
-dnl *** Mini-Commander specific checks                                      ***
-dnl ***************************************************************************
-AC_ARG_ENABLE(mini-commander, [  --enable-mini-commander build mini-commander
-                          [@<:@default: no, transparent upgrade to deskbar-applet@:>@]], 
enable_mini_commander="yes", enable_mini_commander="no")
-AM_CONDITIONAL(BUILD_MINICOMMANDER_APPLET, test "x$enable_mini_commander" = "xyes")
-
-dnl ***************************************************************************
 dnl *** Stickynotes specific checks                                         ***
 dnl ***************************************************************************
 # AC_ARG_ENABLE(stickynotes, [  --enable-stickynotes build stickynotes
@@ -336,9 +319,6 @@ gnome-applets.spec
 Makefile
 po/Makefile.in
 man/Makefile
-mini-commander/help/Makefile
-mini-commander/Makefile
-mini-commander/src/Makefile
 mixer/help/Makefile
 mixer/Makefile
 modemlights/Makefile
@@ -364,7 +344,6 @@ gnome-applets-$VERSION configure summary:
        Source code location:           ${srcdir}
        Compiler:                       ${CC}
 
-        - mini-commander               $enable_mini_commander
         - modemlights                  $BUILD_MODEM_LIGHTS
         - mixer                        $enable_mixer
         - multiload                    $build_gtop_applets
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]