Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=kdetesting.git;a=commitdiff;h=a434ba68bb6c79a00e9062652a195dc2daf19185
commit a434ba68bb6c79a00e9062652a195dc2daf19185
Author: Miklos Vajna <vmik...@frugalware.org>
Date: Wed Jan 20 00:45:35 2010 +0100
acetoneiso2-1.96_beta2-1-i686
- add kiso to replaces()
diff --git a/source/kde-extra/acetoneiso2/FrugalBuild
b/source/kde-extra/acetoneiso2/FrugalBuild
index e02945c..9013f41 100644
--- a/source/kde-extra/acetoneiso2/FrugalBuild
+++ b/source/kde-extra/acetoneiso2/FrugalBuild
@@ -10,7 +10,7 @@ rodepends=('7zip' 'cdrdao' 'cdrtools' 'gpg-agent' 'gnupg' \
'fuseiso' 'kdebase-runtime' 'pinentry-qt' 'coreutils' 'dvd+rw-tools')
groups=('kde-extra')
archs=('i686' 'x86_64')
-replaces=('kcdemu')
+replaces=('kcdemu' 'kiso')
_F_sourceforge_sep="_"
Finclude sourceforge
up2date="lynx -dump 'http://www.acetoneteam.org/download.html'|grep -m1 'LATEST
VERSION'|sed 's/.*].*SO2 v\(.*\)/\1/;s/ /_/'"
diff --git a/source/kde-extra/kiso/FrugalBuild
b/source/kde-extra/kiso/FrugalBuild
deleted file mode 100644
index 8f19045..0000000
--- a/source/kde-extra/kiso/FrugalBuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Compiling Time: 0.26 SBU
-# Maintainer: Miklos Vajna <vmik...@frugalware.org>
-
-pkgname=kiso
-pkgver=0.8.3
-pkgrel=3
-pkgdesc="To make creating, extracting and editing of ISO-Images as easy as
possible."
-Finclude sourceforge
-url="http://kiso.sourceforge.net/";
-depends=('libcdio>=0.81-1' 'kdelibs')
-groups=('kde-extra')
-archs=('i686' 'x86_64')
-options=('scriptlet')
-up2date="lynx -dump $url/download.php|grep tar.bz2|sed -n
's/.*-\(.*\)\.t.*/\1/;1 p'"
-source=($source kiso-0.8.3-libcdio-077.patch)
-sha1sums=('52001f902a96d425a8164fe172a2bf80a5db7fda' \
- '866367cfaf849b125d6d3c660c406ce237d32603')
-
-# optimization OK
diff --git a/source/kde-extra/kiso/kiso-0.8.3-libcdio-077.patch
b/source/kde-extra/kiso/kiso-0.8.3-libcdio-077.patch
deleted file mode 100644
index 0d04677..0000000
--- a/source/kde-extra/kiso/kiso-0.8.3-libcdio-077.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-Index: kiso-0.8.3/src/kiso.cpp
-===================================================================
---- kiso-0.8.3.orig/src/kiso.cpp
-+++ kiso-0.8.3/src/kiso.cpp
-@@ -43,6 +43,11 @@
-
- #define DEFAULT_TIMEOUT_MS 10000
-
-+#if LIBCDIO_VERSION_NUM < 77
-+#define mmc_csb_t scsi_mmc_t
-+#define mmc_run_cmd scsi_run_cmd
-+#endif
-+
- static const char* const image2_data[] = {
- "32 32 41 1",
- ". c None",
-@@ -3591,14 +3596,14 @@ void Mainform::showdrive()
-
- int i_status;
- uint8_t buf[500] = { 0, };
-- scsi_mmc_cdb_t cdb = {{0, }};
-+ mmc_cdb_t cdb = {{0, }};
-
- CDIO_MMC_SET_COMMAND(cdb.field, CDIO_MMC_GPCMD_GET_CONFIGURATION);
- CDIO_MMC_SET_READ_LENGTH8(cdb.field, sizeof(buf));
- cdb.field[1] = CDIO_MMC_GET_CONF_ALL_FEATURES;
- cdb.field[3] = 0x0;
-
-- i_status = scsi_mmc_run_cmd(p_cdio, 0, &cdb, SCSI_MMC_DATA_READ,
sizeof(buf), &buf);
-+ i_status = mmc_run_cmd(p_cdio, 0, &cdb, SCSI_MMC_DATA_READ, sizeof(buf),
&buf);
- if (i_status == 0) {
- uint8_t *p;
- uint32_t i_data;
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
