xfce/xfburn: updated to 0.5.2, some cleanups

6 files changed, 21 insertions, 30 deletions

diff --git a/xfce/xfburn/BUILD b/xfce/xfburn/BUILD
index b5d4cffef6..45d043b20c 100755
--- a/xfce/xfburn/BUILD
+++ b/xfce/xfburn/BUILD
@@ -1,11 +1,5 @@
 if [[ $XFBURN_BRANCH == scm ]]; then
-  ./autogen.sh --prefix=${INSTALL_ROOT}/usr  \
-           --sysconfdir=${INSTALL_ROOT}/etc  \
-        --localstatedir=${INSTALL_ROOT}/var  \
-               --mandir=${INSTALL_ROOT}/usr/share/man   \
-              --infodir=${INSTALL_ROOT}/usr/share/info  \
-                        $OPTS &&
-  make
-else
-  default_build
-fi
+  OPTS="--enable-maintainer-mode $OPTS"
+fi &&
+
+default_build
diff --git a/xfce/xfburn/DEPENDS b/xfce/xfburn/DEPENDS
index 669117246d..5cf6399ae6 100755
--- a/xfce/xfburn/DEPENDS
+++ b/xfce/xfburn/DEPENDS
@@ -4,7 +4,6 @@ depends exo &&
 depends glib2 &&
 depends gtk+2 &&
 depends intltool &&
-depends libxfcegui4 &&
 
 if [[ $XFBURN_BRANCH == scm ]]; then
   depends docbook-xsl &&
@@ -24,12 +23,12 @@ optional_depends thunar \
                  "--enable-thunar-vfs" "--disable-thunar-vfs" \
                  "for Thunar's VFS layer" &&
 
-optional_depends gst-plugins-base \
+optional_depends gst-plugins-base-1.0 \
                  "--enable-gstreamer" "--disable-gstreamer" \
                  "for burning audio support" &&
 
-if is_depends_enabled $SPELL gst-plugins-base; then
-  suggest_depends gst-plugins-good "" "" "for high quality plugins" &&
-  suggest_depends gst-plugins-bad "" "" "for low quality plugins" &&
-  suggest_depends gst-plugins-ugly "" "" "for plugins with licensing issues"
+if is_depends_enabled $SPELL gst-plugins-base-1.0; then
+  suggest_depends gst-plugins-good-1.0 "" "" "for high quality plugins" &&
+  suggest_depends gst-plugins-bad-1.0 "" "" "for low quality plugins" &&
+  suggest_depends gst-plugins-ugly-1.0 "" "" "for plugins with licensing issues"
 fi
diff --git a/xfce/xfburn/DETAILS b/xfce/xfburn/DETAILS
index 8b1c1233fb..4f8b88dacb 100755
--- a/xfce/xfburn/DETAILS
+++ b/xfce/xfburn/DETAILS
@@ -8,11 +8,11 @@ if [[ $XFBURN_BRANCH == scm ]]; then
   FORCE_DOWNLOAD=on
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-git"
 else
-         VERSION=0.4.3
+         VERSION=0.5.2
           BRANCH=`echo $VERSION | cut -d . -f 1,2`
           SOURCE=$SPELL-$VERSION.tar.bz2
    SOURCE_URL[0]=http://archive.xfce.org/src/apps/$SPELL/$BRANCH/$SOURCE
-     SOURCE_HASH=sha512:3b82d763f6ac542eeaac0d752faa487f9f5101b6e2d11080e4ec80141496a3c80edfeb0249b37d7bef49505b37c1dd60468253758bbedbd1258a8f3f0db99205
+     SOURCE_HASH=sha512:3c6f27e2c8e5200d620bf32f938a1fb044b371a9fe0b5474ba8c1a487c79a7761e144ec8490f04c2389c96bc980b9f2bdfebce9d24dea30c5caae451bb9dcf5e
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
 fi
         WEB_SITE=http://www.xfce.org/projects/xfburn/
diff --git a/xfce/xfburn/HISTORY b/xfce/xfburn/HISTORY
index 1dc49a6edd..30737002d6 100644
--- a/xfce/xfburn/HISTORY
+++ b/xfce/xfburn/HISTORY
@@ -1,3 +1,11 @@
+2015-03-05 Pavel Vinogradov <public@sourcemage.org>
+	* DETAILS: version 0.5.2
+	* BUILD: simplified git branch building
+	* DEPENDS: removed libxfcegui4, switched to gstreamer 1.0
+	* PRE_BUILD: removed glib232.patch, moved autogen.sh here for git
+	  branch
+	* glib232.patch: removed
+
 2014-07-03 Ismael Luceno <ismael@sourcemage.org>
 	* DETAILS: Use get_scm_version
 
diff --git a/xfce/xfburn/PRE_BUILD b/xfce/xfburn/PRE_BUILD
index 595d6519e2..532f0f544e 100755
--- a/xfce/xfburn/PRE_BUILD
+++ b/xfce/xfburn/PRE_BUILD
@@ -1,6 +1,6 @@
 default_pre_build &&
 cd "$SOURCE_DIRECTORY" &&
 
-if [[ $XFBURN_BRANCH != scm ]]; then
-  patch -p0 < "$SPELL_DIRECTORY/glib232.patch"
+if [[ $XFBURN_BRANCH == scm ]]; then
+  NOCONFIGURE=1 ./autogen.sh
 fi
diff --git a/xfce/xfburn/glib232.patch b/xfce/xfburn/glib232.patch
deleted file mode 100644
index 9e3951b7ef..0000000000
--- a/xfce/xfburn/glib232.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- xfburn/xfburn-settings.h.orig	2009-10-25 01:18:10.000000000 +0400
-+++ xfburn/xfburn-settings.h	2012-07-26 11:11:42.806567198 +0400
-@@ -24,6 +24,7 @@
- #endif /* !HAVE_CONFIG_H */
- 
- #include <glib.h>
-+#include <glib-object.h>
- 
- G_BEGIN_DECLS
-