summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndraž Levstik2009-05-03 12:52:55 +0200
committerAndraž Levstik2009-05-03 12:52:55 +0200
commit0f007b73f27d94f57eaa212ec4bd81213b0efa13 (patch)
tree547108ef0c52b241e904968faeffd5242807980a
parent62d3108c8ee7450ec3a618bb2a6400d200844756 (diff)
parentb2c319bd0027c6de6d60f09d4a5a821ede468e81 (diff)
Merge branch 'master' of git+ssh://alevstik@scm.sourcemage.org/smgl/grimoire
-rwxr-xr-xdisk/ddrescue/DETAILS4
-rw-r--r--disk/ddrescue/HISTORY4
-rwxr-xr-xdisk/ddrescue/PRE_BUILD1
-rwxr-xr-xprinter/photoprint/DETAILS4
-rw-r--r--printer/photoprint/HISTORY4
-rwxr-xr-xprinter/photoprint/PRE_BUILD8
-rwxr-xr-xutils/bochs/BUILD2
-rwxr-xr-xutils/bochs/DEPENDS3
-rwxr-xr-xutils/bochs/DETAILS6
-rw-r--r--utils/bochs/HISTORY6
-rw-r--r--utils/bochs/bochs-2.3.5.tar.gz.sigbin280 -> 0 bytes
11 files changed, 31 insertions, 11 deletions
diff --git a/disk/ddrescue/DETAILS b/disk/ddrescue/DETAILS
index a9c6f52a25..56816666bf 100755
--- a/disk/ddrescue/DETAILS
+++ b/disk/ddrescue/DETAILS
@@ -1,6 +1,6 @@
SPELL=ddrescue
- VERSION=1.10
- SOURCE_HASH=sha512:cb70f829d86b8ede06cf292d3328321926e6e6e3ec541df28f3cda5a8f59a30cf258b24e401eba6e709dbf69f370c4d651d6a2e702a3a02f14db864f1a9f42d6
+ VERSION=1.11-rc1
+ SOURCE_HASH=sha512:28daa58c70dc00c77b2e0c8003636aafb514d0ddf22ccd2f7debefda7e37512693b8f26f3751bb4f658906b3be50f89c30abc06030c53f14038761d0f4b90ce8
SOURCE="$SPELL-$VERSION.tar.lz"
SOURCE_URL[0]=http://download.savannah.gnu.org/releases/$SPELL/$SOURCE
SOURCE_URL[1]=http://ftp.gnu.org/gnu/$SPELL/$SOURCE
diff --git a/disk/ddrescue/HISTORY b/disk/ddrescue/HISTORY
index f2073b19c8..4faef46c2e 100644
--- a/disk/ddrescue/HISTORY
+++ b/disk/ddrescue/HISTORY
@@ -1,3 +1,7 @@
+2009-05-02 Treeve Jelbert <treeve@sourcemage.org>
+ * DETAILS: version 1.11-rc1
+ * PRE_BUILD: add verify_file
+
2009-03-23 Treeve Jelbert <treeve@sourcemage.org>
* DETAILS: version 1.10
* DEPENDS: add lzip ( tarball is now .lz)
diff --git a/disk/ddrescue/PRE_BUILD b/disk/ddrescue/PRE_BUILD
index 7b6b846e91..bfd8c4907d 100755
--- a/disk/ddrescue/PRE_BUILD
+++ b/disk/ddrescue/PRE_BUILD
@@ -1,2 +1,3 @@
+verify_file &&
cd $BUILD_DIRECTORY &&
lzip -c -d $SOURCE_CACHE/$SOURCE | tar x
diff --git a/printer/photoprint/DETAILS b/printer/photoprint/DETAILS
index bbc2758fa6..749dfc6e3d 100755
--- a/printer/photoprint/DETAILS
+++ b/printer/photoprint/DETAILS
@@ -1,6 +1,6 @@
SPELL=photoprint
- VERSION=0.4.0-pre5
- SOURCE_HASH=sha512:9d816527fec06ee3e114ea3dd90fa74905a359a8887d02c74e30f09da7f72d9e5f0c4fc7746f39b4608c9b3ddd635e3be44a5628cb5cfbe20f76189638729184
+ VERSION=0.4.0
+ SOURCE_HASH=sha512:4f07ac7426645bb3c9a6a52829004583b854a322be795d1e85af23586fad080a278f9bdc349fc6d67af06ef8f160e99e17e52e517e22d15cbbd1601c64e2d3d5
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
WEB_SITE=http://blackfiveimaging.co.uk/
diff --git a/printer/photoprint/HISTORY b/printer/photoprint/HISTORY
index f8baa3861b..305c2d7048 100644
--- a/printer/photoprint/HISTORY
+++ b/printer/photoprint/HISTORY
@@ -1,3 +1,7 @@
+2009-05-02 Treeve Jelbert <treeve@sourcemage.org>
+ * DETAILS: version 0.4.0
+ * PRE_BUILD: added, fix for gcc-4.4, add <cstdio>
+
2009-01-12 Treeve Jelbert <treeve@sourcemage.org>
* DETAILS: version 0.4.0-pre5
diff --git a/printer/photoprint/PRE_BUILD b/printer/photoprint/PRE_BUILD
new file mode 100755
index 0000000000..b63db5e350
--- /dev/null
+++ b/printer/photoprint/PRE_BUILD
@@ -0,0 +1,8 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+# fix for gcc-4.4
+sed -i '1 i\
+#include <cstdio>\
+' support/layoutrectangle.cpp support/signature.cpp support/circlemontage.cpp \
+ support/pathsupport.cpp support/searchpath.cpp support/tempfile.cpp \
+ layout_poster.cpp
diff --git a/utils/bochs/BUILD b/utils/bochs/BUILD
index 1740c95a54..a2ece17b79 100755
--- a/utils/bochs/BUILD
+++ b/utils/bochs/BUILD
@@ -14,10 +14,8 @@ OPTS="--with-x11 \
--enable-idle-hack \
--enable-all-optimizations \
--enable-repeat-speedups \
- --enable-icache \
--enable-plugins \
--enable-save-restore \
- --enable-compressed-hd \
--enable-pnic \
--enable-ne2000 \
--disable-docbook \
diff --git a/utils/bochs/DEPENDS b/utils/bochs/DEPENDS
index 3b364d3098..af469415b8 100755
--- a/utils/bochs/DEPENDS
+++ b/utils/bochs/DEPENDS
@@ -1,5 +1,4 @@
-depends dev86 &&
-optional_depends wxgtk-no-unicode \
+optional_depends wxgtk \
"--with-wx" \
"--without-wx" \
"Adds WX (wxGTK display) support in bochs" &&
diff --git a/utils/bochs/DETAILS b/utils/bochs/DETAILS
index 686ca99494..53fc5674f4 100755
--- a/utils/bochs/DETAILS
+++ b/utils/bochs/DETAILS
@@ -1,10 +1,10 @@
SPELL=bochs
- VERSION=2.3.5
+ VERSION=2.4
+ SOURCE_HASH=sha512:babfd9c405c53d857c0f102b7fc83c0d964ec68d2a6bc0e3382e7814de837fe0d8e7fc85d9c77ae1e676aecfceed030a8756784fa371efe0a9ed3fdc1a4be524
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
-# SOURCE_HASH=sha512:9b3ec6568ad9789a470d197a65dcaec0871f53791cb3a3e182d3192d34edc9b6670e2d35627e72d2ef506ab233059f70af1369041ffc6618d156b9c5cc78550a
- SOURCE_GPG="gurus.gpg:$SOURCE.sig:WORKS_FOR_ME"
+# SOURCE_GPG="gurus.gpg:$SOURCE.sig:WORKS_FOR_ME"
LICENSE[0]=GPL
WEB_SITE=http://bochs.sourceforge.net
KEYWORDS="emulator utils"
diff --git a/utils/bochs/HISTORY b/utils/bochs/HISTORY
index c7cb8718a8..c2948f8df2 100644
--- a/utils/bochs/HISTORY
+++ b/utils/bochs/HISTORY
@@ -1,3 +1,9 @@
+2009-05-02 Treeve Jelbert <treeve@sourcemage.org>
+ * DETAILS: version 2.4
+ * DEPENDS: wxgtk-no-unicode -> wxgtk
+ remove dev86
+ * BUILD: remove deprecated/duplicate options
+
2007-09-16 Eric Sandall <sandalle@sourcemage.org>
* DETAILS: Updated to 2.3.5
Removed UPDATED
diff --git a/utils/bochs/bochs-2.3.5.tar.gz.sig b/utils/bochs/bochs-2.3.5.tar.gz.sig
deleted file mode 100644
index ae77e38d03..0000000000
--- a/utils/bochs/bochs-2.3.5.tar.gz.sig
+++ /dev/null
Binary files differ