diff options
-rw-r--r-- | .SRCINFO | 13 | ||||
-rw-r--r-- | .gitignore | 3 | ||||
-rw-r--r-- | PKGBUILD | 45 | ||||
-rw-r--r-- | dvdisaster.install | 11 | ||||
-rw-r--r-- | secretsauce.patch | 53 |
5 files changed, 56 insertions, 69 deletions
@@ -1,20 +1,17 @@ pkgbase = dvdisaster-secretsauce pkgdesc = Provides a margin of safety against data loss on CD and DVD media caused by aging or scratches - pkgver = 0.72.6 + pkgver = 0.79.6 pkgrel = 1 url = http://www.dvdisaster.com/ - install = dvdisaster.install - arch = i686 arch = x86_64 - license = GPL + license = GPL3 depends = gtk2 provides = dvdisaster conflicts = dvdisaster - options = !makeflags - source = http://dvdisaster.net/downloads/dvdisaster-0.72.6.tar.bz2 + source = dvdisaster-secretsauce_0.79.6.tar.bz2::http://deb.debian.org/debian/pool/main/d/dvdisaster/dvdisaster_0.79.6.orig.tar.bz2 source = secretsauce.patch - sha1sums = eae45e40c2923c7d5c5a01f16470258aa45734ff - sha1sums = 98ef85d933906ab26364351448033be2c72701ca + sha256sums = 7d7dfe9e7f4c2e0df248d6223340afc128367e22ebf3728284227763afd98f87 + sha256sums = a41f0388dcc24b75eff5521bf6662809c488672333394bf0a2f06151a2e8cb68 pkgname = dvdisaster-secretsauce diff --git a/.gitignore b/.gitignore new file mode 100644 index 000000000000..04ea9d0b7e31 --- /dev/null +++ b/.gitignore @@ -0,0 +1,3 @@ +*.tar.bz2 +src/ +pkg/ @@ -1,45 +1,44 @@ # $Id$ pkgname=dvdisaster-secretsauce -_pkgname=dvdisaster -pkgver=0.72.6 +pkgver=0.79.6 pkgrel=1 pkgdesc="Provides a margin of safety against data loss on CD and DVD media caused by aging or scratches" -arch=('i686' 'x86_64') +arch=(x86_64) url="http://www.dvdisaster.com/" -license=('GPL') -depends=('gtk2') -conflicts=(${_pkgname}) -provides=(${_pkgname}) -options=('!makeflags') -install=dvdisaster.install -source=(http://dvdisaster.net/downloads/${_pkgname}-${pkgver}.tar.bz2 secretsauce.patch) -sha1sums=('eae45e40c2923c7d5c5a01f16470258aa45734ff' - '98ef85d933906ab26364351448033be2c72701ca') +license=(GPL3) +depends=(gtk2) +conflicts=(dvdisaster) +provides=(dvdisaster) +#options=('!makeflags') +source=("${pkgname}_${pkgver}.tar.bz2::http://deb.debian.org/debian/pool/main/d/dvdisaster/dvdisaster_${pkgver}.orig.tar.bz2" secretsauce.patch) +sha256sums=('7d7dfe9e7f4c2e0df248d6223340afc128367e22ebf3728284227763afd98f87' + 'a41f0388dcc24b75eff5521bf6662809c488672333394bf0a2f06151a2e8cb68') prepare() { - cd ${_pkgname}-${pkgver} - sed -i 's/dvdisaster48/dvdisaster/' contrib/dvdisaster.desktop + cd dvdisaster-${pkgver} + sed 's/dvdisaster48.png/dvdisaster64.xpm/' -i contrib/dvdisaster.desktop # generated with: diff -Naur dvdisaster-0.72.6 dvdisaster-0.72.6.new > secretsauce.patch patch -p1 < ../secretsauce.patch } build() { - cd ${_pkgname}-${pkgver} - ./configure --prefix=/usr \ - --mandir=/usr/share/man --docdir=/usr/share/doc \ + export CFLAGS="${CFLAGS} -fcommon" + cd dvdisaster-${pkgver} + ./configure \ + --prefix=/usr \ + --mandir=/usr/share/man \ + --docdir=/usr/share/doc \ --localedir=/usr/share/locale \ --with-nls=yes make } package() { - cd ${_pkgname}-${pkgver} + cd dvdisaster-${pkgver} make BUILDROOT="${pkgdir}" install - rm -f "${pkgdir}/usr/bin/dvdisaster-uninstall.sh" - install -D -m 644 contrib/dvdisaster.desktop "${pkgdir}/usr/share/applications/dvdisaster.desktop" - for i in 16 24 32 48 64 ; do - install -D -m 644 contrib/dvdisaster${i}.png "${pkgdir}/usr/share/icons/hicolor/${i}x${i}/dvdisaster.png" - done + install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" COPYING + install -m644 -Dt "${pkgdir}/usr/share/applications/" contrib/dvdisaster.desktop + install -m644 -Dt "${pkgdir}/usr/share/pixmaps/" contrib/dvdisaster64.xpm } diff --git a/dvdisaster.install b/dvdisaster.install deleted file mode 100644 index 1a05f573e594..000000000000 --- a/dvdisaster.install +++ /dev/null @@ -1,11 +0,0 @@ -post_install() { - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/secretsauce.patch b/secretsauce.patch index c673975914f5..db0aba732617 100644 --- a/secretsauce.patch +++ b/secretsauce.patch @@ -1,46 +1,45 @@ -diff -Naur dvdisaster-0.72.6/scsi-layer.c dvdisaster-0.72.6.new/scsi-layer.c ---- dvdisaster-0.72.6/scsi-layer.c 2014-05-28 21:09:00.000000000 +0200 -+++ dvdisaster-0.72.6.new/scsi-layer.c 2015-04-12 17:20:02.484953943 +0200 -@@ -2596,7 +2596,7 @@ - } +diff -Naur dvdisaster-0.79.6/scsi-layer.c dvdisaster-0.79.6.new/scsi-layer.c +--- dvdisaster-0.79.6/scsi-layer.c 2017-11-13 18:53:35.000000000 +0000 ++++ dvdisaster-0.79.6.new/scsi-layer.c 2021-01-29 12:59:33.395625190 +0000 +@@ -2588,14 +2588,14 @@ Verbose("# query_type() returned.\n"); -- -+ /* - if(dh->subType == UNSUPPORTED) + +- if(dh->subType == UNSUPPORTED) ++ /*if(dh->subType == UNSUPPORTED) { char *td = alloca(strlen(dh->typeDescr)+1); -@@ -2605,7 +2605,7 @@ + strcpy(td, dh->typeDescr); + CloseDevice(dh); Stop(_("This software does not support \"%s\" type media."), td); return NULL; - } -- -+ */ +- } ++ }*/ + if(dh->sessions>1) { int sessions = dh->sessions; - -@@ -2685,6 +2685,7 @@ +@@ -2687,20 +2687,20 @@ } default: -+ ;/* - { char *td = alloca(strlen(dh->typeDescr)+1); +- { char *td = alloca(strlen(dh->typeDescr)+1); ++ ;/*{ char *td = alloca(strlen(dh->typeDescr)+1); strcpy(td, dh->typeDescr); -@@ -2692,13 +2693,14 @@ + CloseImage(image); Stop(_("This software does not support \"%s\" type media."), td); return NULL; - } -+ */ +- } ++ }*/ } -- -+ /* - if(dh->mainType == DVD && query_copyright(dh)) - { CloseDevice(dh); + +- if(dh->mainType == DVD && query_copyright(dh)) ++ /*if(dh->mainType == DVD && query_copyright(dh)) + { CloseImage(image); Stop(_("This software does not support encrypted media.\n")); - } -- -+ */ + return NULL; +- } ++ }*/ + /* Create the bitmap of simulated defects */ - if(Closure->simulateDefects) |