summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYalla-One <yallaone@gmail.com>2010-05-11 19:45:32 +0200
committerMichiel van Wessem <michiel@slackbuilds.org>2010-05-11 19:45:32 +0200
commit01442ea93dff185a207ffd438610e78e77767424 (patch)
treec4570085bff63ba77ba0fa5ddf5918b1d4bacb3a
parentc2a8bd721a24644bbc299814e8521ceff7009838 (diff)
downloadslackbuilds-01442ea93dff185a207ffd438610e78e77767424.tar.gz
multimedia/easytag: Updated for version 2.1
-rw-r--r--multimedia/easytag/easytag.SlackBuild17
-rw-r--r--multimedia/easytag/easytag.info6
-rw-r--r--multimedia/easytag/patch_20_remove_glib_warning_on_startup.diff47
3 files changed, 6 insertions, 64 deletions
diff --git a/multimedia/easytag/easytag.SlackBuild b/multimedia/easytag/easytag.SlackBuild
index ae3e0d5f15..b2f3b48a7a 100644
--- a/multimedia/easytag/easytag.SlackBuild
+++ b/multimedia/easytag/easytag.SlackBuild
@@ -1,7 +1,6 @@
#!/bin/sh
# Slackware build script for easytag
-
# Copyright 2006 Halim Issa <yallaone@gmail.com>
# All rights reserved.
#
@@ -22,16 +21,14 @@
# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-# Modified by the SlackBuilds.org project
-
-# Modified by Alex Lysenka <me@alkos333.net>
+# Updated by Alex Lysenka <me@alkos333.net>
PRGNAM=easytag
-VERSION=2.0
+VERSION=2.1
ARCH=${ARCH:-i486}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
-CWD=`pwd`
+CWD=$(pwd)
TMP=${TMP:-/tmp/SBo}
PKG=$TMP/package-$PRGNAM
OUTPUT=${OUTPUT:-/tmp}
@@ -61,13 +58,9 @@ cd $TMP || exit 1
rm -rf $PRGNAM-$VERSION
tar -xjvf $CWD/$PRGNAM-$VERSION.tar.bz2 || exit 1
cd $PRGNAM-$VERSION || exit 1
-
chown -R root:root .
chmod -R u+w,go+r-w,a-s .
-# Eliminates glib errors on start-up
-patch -d $TMP/$PRGNAM-$VERSION/src < $CWD/patch_20_remove_glib_warning_on_startup.diff
-
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
./configure \
@@ -82,10 +75,6 @@ CXXFLAGS="$SLKCFLAGS" \
make || exit 1
make install-strip DESTDIR=$PKG || exit 1
-# Fix path to icon in .desktop file
-sed -i s#'Icon=EasyTAG.xpm'#'Icon=/usr/share/pixmaps/EasyTAG.xpm'# \
- $PKG/usr/share/applications/easytag.desktop || exit 1
-
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION
# We don't need this twice
diff --git a/multimedia/easytag/easytag.info b/multimedia/easytag/easytag.info
index 9623cec47d..63747e4d45 100644
--- a/multimedia/easytag/easytag.info
+++ b/multimedia/easytag/easytag.info
@@ -1,8 +1,8 @@
PRGNAM="easytag"
-VERSION="2.0"
+VERSION="2.1"
HOMEPAGE="http://easytag.sourceforge.net/"
-DOWNLOAD="http://easynews.dl.sourceforge.net/sourceforge/easytag/easytag-2.0.tar.bz2"
-MD5SUM="af37a0a34e4d0808aabb7a24cffc75ee"
+DOWNLOAD="http://dl.sourceforge.net/easytag/easytag-2.1.tar.bz2"
+MD5SUM="a585cb9e400ba460ec1801856ea5e90f"
MAINTAINER="Yalla-One"
EMAIL="yallaone@gmail.com"
APPROVED="BP{k}"
diff --git a/multimedia/easytag/patch_20_remove_glib_warning_on_startup.diff b/multimedia/easytag/patch_20_remove_glib_warning_on_startup.diff
deleted file mode 100644
index 2c58185edb..0000000000
--- a/multimedia/easytag/patch_20_remove_glib_warning_on_startup.diff
+++ /dev/null
@@ -1,47 +0,0 @@
-diff -ruN easytag-2.0.orig/src/bar.c easytag-2.0/src/bar.c
---- easytag-2.0.orig/src/bar.c 2007-02-07 23:27:58.000000000 +0100
-+++ easytag-2.0/src/bar.c 2007-04-06 21:57:52.000000000 +0200
-@@ -253,13 +253,14 @@
- { AM_CDDB_SEARCH_FILE, GTK_STOCK_CDROM, _("CDDB Search File(s)..."), NULL, _("CDDB Search File(s)..."), G_CALLBACK(Cddb_Popup_Menu_Search_Selected_File) },
- //{ AM_ARTIST_OPEN_FILE_WITH, GTK_STOCK_OPEN, _("Open File(s) with ..."), NULL, _("Open File(s) with ..."), G_CALLBACK(Browser_Open_Run_Program_List_Window??? Browser_Open_Run_Program_Tree_Window???) },
- //{ AM_ALBUM_OPEN_FILE_WITH, GTK_STOCK_OPEN, _("Open File(s) with ..."), NULL, _("Open File(s) with ..."), G_CALLBACK(Browser_Open_Run_Program_List_Window??? Browser_Open_Run_Program_Tree_Window???) },
-+
- };
-
- GtkToggleActionEntry ToggleActionEntries[] =
- {
-- { AM_BROWSE_SUBDIR, GTK_STOCK_INDEX, _("Browse _Sub-directories"), NULL, _("Browse _Sub-directories"), NULL, FALSE },
-+ { AM_BROWSE_SUBDIR, NULL, _("Browse _Sub-directories"), NULL, _("Browse _Sub-directories"), NULL, BROWSE_SUBDIR },
- #ifndef WIN32 // No sense here for Win32, "hidden" means : starts with a '.'
-- { AM_BROWSER_HIDDEN_DIR, NULL, _("Show Hidden Directories"), NULL, _("Show Hidden Directories"), G_CALLBACK(Browser_Tree_Rebuild), FALSE },
-+ { AM_BROWSER_HIDDEN_DIR, NULL, _("Show Hidden Directories"), NULL, _("Show Hidden Directories"), G_CALLBACK(Browser_Tree_Rebuild), BROWSE_HIDDEN_DIR },
- #endif
- { AM_VIEWMODE_TOGGLE, "easytag-artist-album", _("Show tree browser / Display by Artist and Album"), NULL, _("Show tree browser / Display by Artist and Album"), G_CALLBACK(Action_Select_Browser_Style), FALSE },
- };
-@@ -329,7 +330,7 @@
- CheckMenuItemBrowseSubdirMainMenu = gtk_ui_manager_get_widget(UIManager, "/MenuBar/BrowserMenu/BrowseSubdir");
- if (CheckMenuItemBrowseSubdirMainMenu)
- {
-- gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(CheckMenuItemBrowseSubdirMainMenu),BROWSE_SUBDIR);
-+ // Link to update BROWSE_SUBDIR when changed
- g_signal_connect(G_OBJECT(CheckMenuItemBrowseSubdirMainMenu),"toggled",
- G_CALLBACK(Check_Menu_Item_Toggled_Browse_Subdir),NULL);
- }
-@@ -337,7 +338,7 @@
- CheckMenuItemBrowseHiddenDirMainMenu = gtk_ui_manager_get_widget(UIManager, "/MenuBar/BrowserMenu/BrowseHiddenDir");
- if (CheckMenuItemBrowseHiddenDirMainMenu)
- {
-- gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(CheckMenuItemBrowseHiddenDirMainMenu),BROWSE_HIDDEN_DIR);
-+ // Link to update BROWSE_HIDDEN_DIR when changed
- g_signal_connect(G_OBJECT(CheckMenuItemBrowseHiddenDirMainMenu),"toggled",
- G_CALLBACK(Check_Menu_Item_Toggled_Browse_Hidden_Dir),NULL);
- }
-@@ -369,7 +370,7 @@
- Check_Menu_Item_Update_Browse_Hidden_Dir();
-
- // Reload directory, in case we have changed BROWSE_HIDDEN_DIR
-- Browser_Tree_Rebuild(NULL);
-+ //Browser_Tree_Rebuild(NULL); // Commented, as already done in GtkToggleActionEntry for AM_BROWSER_HIDDEN_DIR
- }
- void Check_Menu_Item_Update_Browse_Hidden_Dir (void)
- {