File byzanz-make-panel-optional.patch of Package byzanz

Overview Repositories Revisions Requests Users Attributes Meta

File byzanz-make-panel-optional.patch of Package byzanz (Revision bb38e8c0b739baaa9a1a17d83cf1190a)

Currently displaying revision bb38e8c0b739baaa9a1a17d83cf1190a , Show latest

From d574a750f7bb3a6a6155ad62d99c13ae73fc962a Mon Sep 17 00:00:00 2001
From: Jasper St. Pierre <jstpierre@mecheye.net>
Date: Tue, 19 Mar 2013 17:30:03 +0000
Subject: Make the panel applet optional

---
Index: byzanz-0.2.3/configure.ac
===================================================================
--- byzanz-0.2.3.orig/configure.ac
+++ byzanz-0.2.3/configure.ac
@@ -75,9 +75,12 @@ PKG_CHECK_MODULES(GTK, cairo >= $CAIRO_R
 PKG_CHECK_MODULES(XDAMAGE, xdamage >= $XDAMAGE_REQ)
 
 LIBPANEL_APPLET="libpanelapplet-4.0"
-PKG_CHECK_MODULES(APPLET, $LIBPANEL_APPLET >= $APPLET_REQ)
-appletdir=`$PKG_CONFIG --variable=libpanel_applet_dir $LIBPANEL_APPLET`
-AC_SUBST(appletdir)
+PKG_CHECK_MODULES(APPLET, $LIBPANEL_APPLET >= $APPLET_REQ,
+                  have_applet=yes, have_applet=no)
+AM_CONDITIONAL(HAVE_APPLET, [test x$have_applet = xyes])
+AS_IF([test x$have_applet = xyes],
+      [appletdir=`$PKG_CONFIG --variable=libpanel_applet_dir $LIBPANEL_APPLET`
+       AC_SUBST(appletdir)],[])
 
 PKG_CHECK_MODULES(GST, gstreamer-app-0.10 >= $GST_REQ gstreamer-0.10 >= $GST_REQ)
 
Index: byzanz-0.2.3/src/Makefile.am
===================================================================
--- byzanz-0.2.3.orig/src/Makefile.am
+++ byzanz-0.2.3/src/Makefile.am
@@ -1,6 +1,5 @@
 noinst_LTLIBRARIES = libbyzanz.la
 bin_PROGRAMS = byzanz-record byzanz-playback
-libexec_PROGRAMS = byzanz-applet
 man_MANS = byzanz-record.1 byzanz-playback.1
 
 BUILT_SOURCES = \
@@ -50,7 +49,7 @@ libbyzanz_la_SOURCES = \
 
 libbyzanz_la_CFLAGS = $(BYZANZ_CFLAGS) -I$(top_srcdir)/gifenc
 libbyzanz_la_LIBADD = $(BYZANZ_LIBS) $(top_builddir)/gifenc/libgifenc.la
-		 
+
 byzanz_playback_SOURCES = \
 	playback.c
 
@@ -64,6 +63,8 @@ byzanz_record_SOURCES = \
 byzanz_record_CFLAGS = $(BYZANZ_CFLAGS)
 byzanz_record_LDADD = $(BYZANZ_LIBS) ./libbyzanz.la
 
+if HAVE_APPLET
+libexec_PROGRAMS = byzanz-applet
 
 byzanz_applet_SOURCES = \
 	byzanzapplet.c \
@@ -73,26 +74,6 @@ byzanz_applet_SOURCES = \
 byzanz_applet_CFLAGS = -DBYZANZ_MENU_UI_DIR=\""$(uidir)"\" $(APPLET_CFLAGS)
 byzanz_applet_LDADD = $(APPLET_LIBS) ./libbyzanz.la
 
-
-byzanzmarshal.h: byzanzmarshal.list
-	$(GLIB_GENMARSHAL) --prefix=byzanz_marshal $(srcdir)/byzanzmarshal.list --header > byzanzmarshal.h
-
-byzanzmarshal.c: byzanzmarshal.list
-	(echo "#include \"byzanzmarshal.h\""; \
-	 $(GLIB_GENMARSHAL) --prefix=byzanz_marshal $(srcdir)/byzanzmarshal.list --body) > byzanzmarshal.c
-
-
-schemasdir   = @GCONF_SCHEMA_FILE_DIR@
-schemas_in_files = byzanz.schemas.in
-schemas_DATA = $(schemas_in_files:.schemas.in=.schemas)
-
-@INTLTOOL_SCHEMAS_RULE@
-
-if GCONF_SCHEMAS_INSTALL
-install-data-local:
-	GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(schemas_DATA) ;
-endif
-
 applet_in_files = org.gnome.ByzanzApplet.panel-applet.in
 applet_DATA     = $(applet_in_files:.panel-applet.in=.panel-applet)
 
@@ -115,6 +96,26 @@ org.gnome.panel.applet.ByzanzAppletFacto
 
 uidir = $(datadir)/byzanz
 ui_DATA = byzanzapplet.xml
+endif
+
+byzanzmarshal.h: byzanzmarshal.list
+	$(GLIB_GENMARSHAL) --prefix=byzanz_marshal $(srcdir)/byzanzmarshal.list --header > byzanzmarshal.h
+
+byzanzmarshal.c: byzanzmarshal.list
+	(echo "#include \"byzanzmarshal.h\""; \
+	 $(GLIB_GENMARSHAL) --prefix=byzanz_marshal $(srcdir)/byzanzmarshal.list --body) > byzanzmarshal.c
+
+
+schemasdir   = @GCONF_SCHEMA_FILE_DIR@
+schemas_in_files = byzanz.schemas.in
+schemas_DATA = $(schemas_in_files:.schemas.in=.schemas)
+
+@INTLTOOL_SCHEMAS_RULE@
+
+if GCONF_SCHEMAS_INSTALL
+install-data-local:
+	GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(schemas_DATA) ;
+endif
 
 CLEANFILES = $(applet_DATA) $(applet_DATA).in $(service_DATA) $(schemas_DATA) $(BUILT_SOURCES)
 
@@ -125,4 +126,3 @@ EXTRA_DIST = \
 	$(ui_DATA) \
 	$(schemas_in_files)
 
-

Places

File byzanz-make-panel-optional.patch of Package byzanz (Revision bb38e8c0b739baaa9a1a17d83cf1190a)

Places