Update to devede-3.18.0.

This commit is contained in:
ajacoutot 2011-11-22 08:55:23 +00:00
parent 474f7c588b
commit 0053f9d4e2
9 changed files with 58 additions and 69 deletions

View File

@ -1,9 +1,8 @@
# $OpenBSD: Makefile,v 1.27 2011/09/16 10:31:23 espie Exp $
# $OpenBSD: Makefile,v 1.28 2011/11/22 08:55:23 ajacoutot Exp $
COMMENT= video DVDs and CDs creation tool
DISTNAME= devede-3.16.9
REVISION= 0
DISTNAME= devede-3.18.0
CATEGORIES= multimedia x11
@ -36,6 +35,8 @@ PKG_ARCH= ${MACHINE_ARCH},${ARCH}
PKG_ARCH= *
.endif
WRKDIST= ${WRKDIR}/devede
NO_BUILD= Yes
NO_REGRESS= Yes
@ -49,7 +50,7 @@ pre-configure:
do-install:
cd ${WRKSRC} && \
/bin/sh install.sh prefix=${TRUEPREFIX} libdir=${MODPY_SITEPKG} uninstall=no
/bin/sh install.sh prefix=${TRUEPREFIX} uninstall=no
find ${PREFIX} -name \*.orig -or -name \*~ | xargs rm
.include <bsd.port.mk>

View File

@ -1,5 +1,5 @@
MD5 (devede-3.16.9.tar.bz2) = 81xeciZO4nIZTPpVi0PlmA==
RMD160 (devede-3.16.9.tar.bz2) = w7+bgz1QP412BpGNGaly+Yxi6Y8=
SHA1 (devede-3.16.9.tar.bz2) = a4cVNKZHv1Em558bMTlLhbfmYCY=
SHA256 (devede-3.16.9.tar.bz2) = 7Mq6hok5Nf+Jjnsm13IhRAM2KmyNcpZFd4FGVgwawME=
SIZE (devede-3.16.9.tar.bz2) = 2368434
MD5 (devede-3.18.0.tar.bz2) = 5Ih93MxOlGjRuhyVHK8yAQ==
RMD160 (devede-3.18.0.tar.bz2) = pc55x7jbViqknJyEzDY6UCInRWs=
SHA1 (devede-3.18.0.tar.bz2) = maTGNd9I3liZ+oEcD3jAbdB8GmU=
SHA256 (devede-3.18.0.tar.bz2) = gqV8ny6E8XDRVTof65uGREnyn30nvDB2HD1D26Z5fwQ=
SIZE (devede-3.18.0.tar.bz2) = 2415789

View File

@ -1,4 +1,4 @@
$OpenBSD: patch-devede_fonts_py,v 1.2 2009/08/13 21:09:55 kili Exp $
$OpenBSD: patch-devede_fonts_py,v 1.3 2011/11/22 08:55:23 ajacoutot Exp $
--- devede_fonts.py.orig Fri Jul 17 00:19:27 2009
+++ devede_fonts.py Wed Aug 12 21:45:09 2009
@@ -29,7 +29,7 @@ def prepare_devede_font(home,font_path):
@ -6,7 +6,7 @@ $OpenBSD: patch-devede_fonts_py,v 1.2 2009/08/13 21:09:55 kili Exp $
from RPM files, so DeVeDe must search in several directories """
- path_list=[font_path,"/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans.ttf","/usr/share/fonts/truetype/ttf-dejavu/dejavusans.ttf"]
+ path_list=[font_path,"${LOCALBASE}/lib/X11/fonts/dejavu/DejaVuSans.ttf","${LOCALBASE}/lib/X11/fonts/dejavu/dejavusans.ttf"]
+ path_list=[font_path,"${X11BASE}/lib/X11/fonts/TTF/DejaVuSans.ttf","/usr/share/fonts/truetype/ttf-dejavu/dejavusans.ttf"]
#if our font for subtitles isn't installed, we install it

View File

@ -1,4 +1,4 @@
$OpenBSD: patch-devede_help_py,v 1.2 2009/08/07 17:19:14 ajacoutot Exp $
$OpenBSD: patch-devede_help_py,v 1.3 2011/11/22 08:55:23 ajacoutot Exp $
--- devede_help.py.orig Fri May 15 10:05:20 2009
+++ devede_help.py Fri May 15 10:05:50 2009
@@ -42,7 +42,7 @@ class show_help(devede_executor.executor):
@ -6,7 +6,7 @@ $OpenBSD: patch-devede_help_py,v 1.2 2009/08/07 17:19:14 ajacoutot Exp $
self.printout=False
- launch_list=[[True,"yelp"],[False,"epiphany"],[False,"konqueror"],[False,"firefox","-new-window"],[False,"opera","-newwindow"]]
+ launch_list=[[True,"xdg-open"],[False,"epiphany"],[False,"konqueror"],[False,"firefox","-new-window"],[False,"opera","-newwindow"]]
+ launch_list=[[True,"yelp"],[False,"xdg-open"]]
file=os.path.join(installpath,"html",filename)

View File

@ -1,6 +1,6 @@
$OpenBSD: patch-devede_py,v 1.15 2011/06/20 13:24:28 ajacoutot Exp $
--- devede.py.orig Sat Jul 3 00:09:18 2010
+++ devede.py Mon Jun 20 15:19:37 2011
$OpenBSD: patch-devede_py,v 1.16 2011/11/22 08:55:23 ajacoutot Exp $
--- devede.py.orig Sun Nov 20 13:26:23 2011
+++ devede.py Tue Nov 22 09:43:11 2011
@@ -19,6 +19,13 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
@ -15,25 +15,18 @@ $OpenBSD: patch-devede_py,v 1.15 2011/06/20 13:24:28 ajacoutot Exp $
import sys
import os
@@ -35,7 +42,7 @@ import pickle
@@ -34,8 +41,8 @@ import shutil
import pickle
import cairo
print "DeVeDe 3.16.9"
-print "DeVeDe 3.17.1"
-if (sys.platform!="win32") and (sys.platform!="win64"):
+print "DeVeDe 3.18.0"
+if (sys.platform!="win32") and (sys.platform!="win64") and not sys.platform.startswith('openbsd'):
try:
print "Locale: "+str(os.environ["LANG"])
except:
@@ -44,7 +51,7 @@ if (sys.platform!="win32") and (sys.platform!="win64")
# append the directories where we install the devede's own modules
tipo=-1
try:
- fichero=open("/usr/share/devede/wmain.ui","r")
+ fichero=open("${PREFIX}/share/devede/wmain.ui","r")
fichero.close()
tipo=0
found=True
@@ -78,13 +85,13 @@ if tipo==0:
@@ -79,13 +86,13 @@ if tipo==0:
#arbol=gtk.Builder("/usr/share/devede/devede.glade",domain="devede")
# append the directories where we install the devede's own modules

View File

@ -1,12 +1,12 @@
$OpenBSD: patch-install_sh,v 1.4 2011/06/20 13:24:28 ajacoutot Exp $
--- install.sh.orig Sat Jul 3 00:29:29 2010
+++ install.sh Mon Jun 20 15:18:56 2011
$OpenBSD: patch-install_sh,v 1.5 2011/11/22 08:55:23 ajacoutot Exp $
--- install.sh.orig Fri May 6 00:38:01 2011
+++ install.sh Tue Nov 22 09:31:33 2011
@@ -57,7 +57,7 @@ install_others() # arg1=bindir, arg2=datadir, arg3=pkg
install -m 755 -d "${DESTDIR}${4}/backgrounds"
install -m 644 "${scriptdir}/interface"/* "${DESTDIR}${4}/"
install -m 644 "${scriptdir}/devedesans.ttf" "${DESTDIR}${4}/"
- install -m 644 "${scriptdir}/pixmaps"/* "${DESTDIR}${4}/"
- install -m 644 "${scriptdir}/pixmaps"/* "${DESTDIR}${4}/" 2>/dev/null
+ install -m 644 "${scriptdir}/pixmaps"/*.* "${DESTDIR}${4}/"
install -m 644 "${scriptdir}/pixmaps/backgrounds"/* "${DESTDIR}${4}/backgrounds/"
install -m 644 "${scriptdir}/pixmaps/backgrounds"/* "${DESTDIR}${4}/backgrounds/"
install -m 644 "${scriptdir}/devede.svg" "${DESTDIR}${4}/"

View File

@ -1,11 +0,0 @@
$OpenBSD: patch-interface_aboutdialog1_ui,v 1.1 2009/05/15 08:11:59 ajacoutot Exp $
--- interface/aboutdialog1.ui.orig Fri May 15 10:02:47 2009
+++ interface/aboutdialog1.ui Fri May 15 10:02:54 2009
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
<interface>
- <requires lib="gtk+" version="2.16"/>
+ <requires lib="gtk+" version="2.14"/>
<!-- interface-naming-policy toplevel-contextual -->
<object class="GtkAboutDialog" id="aboutdialog1">
<property name="border_width">5</property>

View File

@ -1,10 +1,10 @@
$OpenBSD: patch-interface_wfolder_dialog_ui,v 1.3 2010/03/21 10:48:10 ajacoutot Exp $
--- interface/wfolder_dialog.ui.orig Mon Jan 18 00:01:50 2010
+++ interface/wfolder_dialog.ui Mon Feb 8 09:00:37 2010
@@ -25,7 +25,7 @@
<property name="width_request">330</property>
$OpenBSD: patch-interface_wfolder_dialog_ui,v 1.4 2011/11/22 08:55:23 ajacoutot Exp $
--- interface/wfolder_dialog.ui.orig Sun Nov 20 13:40:04 2011
+++ interface/wfolder_dialog.ui Tue Nov 22 09:29:41 2011
@@ -70,7 +70,7 @@
<property name="height_request">89</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Choose the folder where DeVeDe will create the DVD image and a name for it. Don't use a folder in a VFAT/FAT32 drive. Characters /, | and \ are not allowed and will be replaced by underscores.</property>
+ <property name="label" translatable="yes">Choose the folder where DeVeDe will create the DVD image and a name for it. Don't use a folder in a VFAT/FAT32 drive and make sure you have enough free space available (about 3 times the final disk size). Characters /, | and \ are not allowed and will be replaced by underscores.</property>
<property name="justify">center</property>

View File

@ -1,26 +1,28 @@
@comment $OpenBSD: PLIST,v 1.13 2011/06/20 13:24:28 ajacoutot Exp $
@comment $OpenBSD: PLIST,v 1.14 2011/11/22 08:55:23 ajacoutot Exp $
bin/devede
bin/devede-debug
bin/devede_debug
lib/python${MODPY_VERSION}/site-packages/devede/
lib/python${MODPY_VERSION}/site-packages/devede/devede_bincue.py
lib/python${MODPY_VERSION}/site-packages/devede/devede_convert.py
lib/python${MODPY_VERSION}/site-packages/devede/devede_delete.py
lib/python${MODPY_VERSION}/site-packages/devede/devede_dialogs.py
lib/python${MODPY_VERSION}/site-packages/devede/devede_disctype.py
lib/python${MODPY_VERSION}/site-packages/devede/devede_dvd.py
lib/python${MODPY_VERSION}/site-packages/devede/devede_dvdmenu.py
lib/python${MODPY_VERSION}/site-packages/devede/devede_executor.py
lib/python${MODPY_VERSION}/site-packages/devede/devede_fonts.py
lib/python${MODPY_VERSION}/site-packages/devede/devede_help.py
lib/python${MODPY_VERSION}/site-packages/devede/devede_loadsave.py
lib/python${MODPY_VERSION}/site-packages/devede/devede_main.py
lib/python${MODPY_VERSION}/site-packages/devede/devede_newfiles.py
lib/python${MODPY_VERSION}/site-packages/devede/devede_other.py
lib/python${MODPY_VERSION}/site-packages/devede/devede_subtitles.py
lib/python${MODPY_VERSION}/site-packages/devede/devede_title_properties.py
lib/python${MODPY_VERSION}/site-packages/devede/devede_video_convert.py
lib/python${MODPY_VERSION}/site-packages/devede/devede_xml_menu.py
lib/devede/
lib/devede/devede_bincue.py
lib/devede/devede_convert.py
lib/devede/devede_delete.py
lib/devede/devede_dialogs.py
lib/devede/devede_disctype.py
lib/devede/devede_dvd.py
lib/devede/devede_dvdmenu.py
lib/devede/devede_executor.py
lib/devede/devede_ffmpeg_convert.py
lib/devede/devede_fonts.py
lib/devede/devede_help.py
lib/devede/devede_loadsave.py
lib/devede/devede_main.py
lib/devede/devede_newfiles.py
lib/devede/devede_other.py
lib/devede/devede_settings.py
lib/devede/devede_subtitles.py
lib/devede/devede_title_properties.py
lib/devede/devede_video_convert.py
lib/devede/devede_xml_menu.py
share/applications/devede.desktop
share/devede/
share/devede/aboutdialog1.ui
@ -46,7 +48,9 @@ share/devede/icon_dvd.png
share/devede/icon_svcd.png
share/devede/icon_vcd.png
share/devede/languages.lst
share/devede/settings.ui
share/devede/silence.ogg
share/devede/use_ffmpeg.ui
share/devede/waborted_dialog.ui
share/devede/wcancel_dialog.ui
share/devede/wcancel_job_dialog.ui
@ -109,6 +113,8 @@ share/doc/devede/html/movie4.jpg
share/doc/devede/html/movie5.jpg
share/doc/devede/html/movie6.jpg
share/doc/devede/html/movie7.jpg
share/doc/devede/html/preferences.html
share/doc/devede/html/preferences.jpg
share/doc/devede/html/psf.html
share/doc/devede/html/select.html
share/doc/devede/html/subs.jpg