Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=wx28.git;a=commitdiff;h=38c62b180e5b6346df056376d650dfa942d6e43b
commit 38c62b180e5b6346df056376d650dfa942d6e43b Author: crazy <[EMAIL PROTECTED]> Date: Thu Dec 6 05:03:03 2007 +0100 dvdstyler-1.5.1-1-i686 * Version bump * removed broken custom up2date ( brr ) * moved away from 'gnome' , wth this ? * added an patch to fix autotools * url fix * removed old patch * changed maintainer to me diff --git a/source/gnome-extra/dvdstyler/FrugalBuild b/source/gnome-extra/dvdstyler/FrugalBuild deleted file mode 100644 index 4fb10b6..0000000 --- a/source/gnome-extra/dvdstyler/FrugalBuild +++ /dev/null @@ -1,34 +0,0 @@ -# Compiling Time: ~0.65 SBU -# Maintainer: BMH1980 <[EMAIL PROTECTED]> - -pkgname=dvdstyler -pkgver=1.4 -pkgrel=6 -pkgdesc="DVDStyler is a crossplatform dvd authoring system." -_F_sourceforge_dirname="dvdstyler" -_F_sourceforge_name="DVDStyler" -Finclude sourceforge -url="http://dvdstyler.sourceforge.net/"; -makedepends=('dvdauthor' 'netpbm') -depends=('libgnomeui' 'mpgtx' 'wxgtk' 'mjpegtools>=1.8.0-2' 'cdrtools' 'dvd+rw-tools') -up2date="lynx -dump http://dvdstyler.sourceforge.net/downloads.html | grep Source | head -n 1 | cut -d ' ' -f 9 | cut -d '-' -f 2 | sed 's|.tar.gz||'" -source=($source dvdstyler-amd64-gcc4fix.patch) -license="GPL2" -options=('scriptlet') -groups=('gnome-extra') -archs=('i686' 'x86_64') -sha1sums=('5374a5f58dbef7b2180a5e89f416cf2c1cbc64ab' \ - 'f7c802dc6f6ae1b9b856e18859cebd2e1d95c4df') - -build() -{ - Fcd DVDStyler-$pkgver - if [ "$CARCH" == "x86_64" ]; then - Fpatch dvdstyler-amd64-gcc4fix.patch - fi - Fmake - Fmakeinstall - Fmv /usr/share/doc/$pkgname /usr/share/doc/$pkgname-$pkgver -} - -# optimization OK diff --git a/source/gnome-extra/dvdstyler/dvdstyler-amd64-gcc4fix.patch b/source/gnome-extra/dvdstyler/dvdstyler-amd64-gcc4fix.patch deleted file mode 100644 index de22e2f..0000000 --- a/source/gnome-extra/dvdstyler/dvdstyler-amd64-gcc4fix.patch +++ /dev/null @@ -1,32 +0,0 @@ -diff -Naur DVDStyler-1.4.orig/src/ButtonPropDlg.cpp DVDStyler-1.4/src/ButtonPropDlg.cpp ---- DVDStyler-1.4.orig/src/ButtonPropDlg.cpp 2005-08-05 12:27:38.000000000 +0200 -+++ DVDStyler-1.4/src/ButtonPropDlg.cpp 2005-08-05 12:27:13.000000000 +0200 -@@ -115,14 +115,14 @@ - int ButtonPropDlg::GetTsi() - { - if (m_titlesetChoice->GetSelection() >= 0) -- return ((int) m_titlesetChoice->GetClientData(m_titlesetChoice->GetSelection()))-1; -+ return ((long) m_titlesetChoice->GetClientData(m_titlesetChoice->GetSelection()))-1; - return 0; - } - - int ButtonPropDlg::GetPgci() - { - if (m_targetChoice->GetSelection() >= 0) -- return (int) m_targetChoice->GetClientData(m_targetChoice->GetSelection()); -+ return (long) m_targetChoice->GetClientData(m_targetChoice->GetSelection()); - return 0; - } - -@@ -296,9 +296,9 @@ - return false; - } - int n = 1; -- int tsi = ((int)GetClientData(n++))-1; -+ int tsi = ((long)GetClientData(n++))-1; - m_object->SetActionTsi(tsi != m_tsi ? tsi : -2); -- m_object->SetActionPgci((int)GetClientData(n++)); -+ m_object->SetActionPgci((long)GetClientData(n++)); - m_object->SetActionChapter(GetInt(n++)); - if (GetBool(n++)) - m_object->SetCustomAction(GetString(n)); diff --git a/source/gnome-extra/dvdstyler/dvdstyler.install b/source/gnome-extra/dvdstyler/dvdstyler.install deleted file mode 100644 index 60bfe59..0000000 --- a/source/gnome-extra/dvdstyler/dvdstyler.install +++ /dev/null @@ -1,21 +0,0 @@ -post_install() -{ - echo -n "updating desktop database..." - if update-desktop-database > /dev/null 2>&1 ; then - echo " done." - else - echo " failed." - fi -} - -post_remove() -{ - post_install -} - -op=$1 -shift - -$op $* - -# vim: ft=sh diff --git a/source/xapps-extra/dvdstyler/FrugalBuild b/source/xapps-extra/dvdstyler/FrugalBuild new file mode 100644 index 0000000..550c991 --- /dev/null +++ b/source/xapps-extra/dvdstyler/FrugalBuild @@ -0,0 +1,35 @@ +# Compiling Time: ~0.65 SBU +# Maintainer: crazy <[EMAIL PROTECTED]> +# Contributor: BMH1980 <[EMAIL PROTECTED]> + +pkgname=dvdstyler +pkgver=1.5.1 +pkgrel=1 +pkgdesc="DVDStyler is a crossplatform dvd authoring system." +_F_sourceforge_dirname="dvdstyler" +_F_sourceforge_name="DVDStyler" +Finclude sourceforge +url="http://www.dvdstyler.de"; +makedepends=('dvdauthor' 'netpbm') +depends=('mpgtx' 'wxgtk>=2.8.1' 'mjpegtools>=1.8.0-2' 'cdrtools' 'dvd+rw-tools' 'wxsvg') +source=($source fix-autotools.patch) +license="GPL2" +options=('scriptlet') +groups=('xapps-extra') +archs=('i686' 'x86_64') +sha1sums=('c466dca9a5ff318dd43eb73d1acd0a360a68efd4' \ + 'cc9403bef31726c7e42d8786817e48f56c544a8c') + +build() +{ + Fcd DVDStyler-$pkgver + Fpatchall + touch NEWS || Fdie + Fautoreconf + Fmake + Fmakeinstall + # twice there + Frm usr/share/doc/dvdstyler +} + +# optimization OK diff --git a/source/xapps-extra/dvdstyler/dvdstyler.install b/source/xapps-extra/dvdstyler/dvdstyler.install new file mode 100644 index 0000000..60bfe59 --- /dev/null +++ b/source/xapps-extra/dvdstyler/dvdstyler.install @@ -0,0 +1,21 @@ +post_install() +{ + echo -n "updating desktop database..." + if update-desktop-database > /dev/null 2>&1 ; then + echo " done." + else + echo " failed." + fi +} + +post_remove() +{ + post_install +} + +op=$1 +shift + +$op $* + +# vim: ft=sh diff --git a/source/xapps-extra/dvdstyler/fix-autotools.patch b/source/xapps-extra/dvdstyler/fix-autotools.patch new file mode 100644 index 0000000..0d5ba1d --- /dev/null +++ b/source/xapps-extra/dvdstyler/fix-autotools.patch @@ -0,0 +1,30 @@ +diff -Naur DVDStyler-1.5.1/configure.in DVDStyler-1.5.1-p/configure.in +--- DVDStyler-1.5.1/configure.in 2007-02-22 19:34:46.000000000 +0100 ++++ DVDStyler-1.5.1-p/configure.in 2007-12-06 04:33:53.000000000 +0100 +@@ -148,5 +148,4 @@ + buttons/Makefile + objects/Makefile + data/Makefile +- install.win32/Makefile + ]) +diff -Naur DVDStyler-1.5.1/src/Makefile.am DVDStyler-1.5.1-p/src/Makefile.am +--- DVDStyler-1.5.1/src/Makefile.am 2007-07-08 19:11:50.000000000 +0200 ++++ DVDStyler-1.5.1-p/src/Makefile.am 2007-12-06 04:34:22.000000000 +0100 +@@ -7,7 +7,7 @@ + BurnDlg.cpp ProgressDlg.cpp\ + MainWin.cpp dvdstyler.cpp + +-CXXFLAGS = @CXXFLAGS@ -I.. ++AM_CXXFLAGS = @CXXFLAGS@ -I.. + LDADD = ../wxVillaLib/libwxvilla.a + + SUBDIRS = rc +diff -Naur DVDStyler-1.5.1/wxVillaLib/Makefile.am DVDStyler-1.5.1-p/wxVillaLib/Makefile.am +--- DVDStyler-1.5.1/wxVillaLib/Makefile.am 2006-12-06 15:09:21.000000000 +0100 ++++ DVDStyler-1.5.1-p/wxVillaLib/Makefile.am 2007-12-06 04:35:17.000000000 +0100 +@@ -3,4 +3,4 @@ + PipeExecute.cpp PropDlg.cpp SConv.cpp\ + Thumbnails.cpp ThumbnailFactory.cpp\ + utils.cpp VerticalToolbar.cpp +-CXXFLAGS = @CXXFLAGS@ @GNOMEUI2_CFLAGS@ ++AM_CXXFLAGS = @CXXFLAGS@ @GNOMEUI2_CFLAGS@ _______________________________________________ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git
