diff options
| author | Alexander Tsamutali | 2008-08-02 12:10:53 +0400 |
|---|---|---|
| committer | Alexander Tsamutali | 2008-08-02 12:10:53 +0400 |
| commit | 46a1ab2b1ea6254b03eafa7b379067763a1c128f (patch) | |
| tree | 4b6d25402170ac08501167907bf341a5bb2242ee | |
| parent | 1f1188f47a048b45fb7eda4d43d01b62571cb7bd (diff) | |
| parent | c29ac31521662b60ee3dda45d11b92360567390d (diff) | |
Merge branch 'master' of ssh://astsmtl@scm.sourcemage.org/smgl/grimoire
35 files changed, 163 insertions, 14 deletions
@@ -1,3 +1,9 @@ +2008-08-01 George Sherwood <gsherwood@sourcemage.org> + * collab/cola: new spell - git gui + +2008-08-01 Treeve Jelbert <treeve@sourcemage.org> + * disk/partimage-ng: new spell - partition archiver + 2008-07-31 Arjan Bouter <abouter@sourcemage.org> * security-libs/pam_ccreds: new spell, caching of credentials for offline use diff --git a/collab/cola/BUILD b/collab/cola/BUILD new file mode 100755 index 0000000000..27ba77ddaf --- /dev/null +++ b/collab/cola/BUILD @@ -0,0 +1 @@ +true diff --git a/collab/cola/DEPENDS b/collab/cola/DEPENDS new file mode 100755 index 0000000000..a10cbfdb1f --- /dev/null +++ b/collab/cola/DEPENDS @@ -0,0 +1,4 @@ +depends git && +depends python && +depends pyqt4 && +depends simplejson diff --git a/collab/cola/DETAILS b/collab/cola/DETAILS new file mode 100755 index 0000000000..794a5139e5 --- /dev/null +++ b/collab/cola/DETAILS @@ -0,0 +1,16 @@ + SPELL=cola + VERSION=1.1.1.9 + SOURCE="${SPELL}-${VERSION}.tar.gz" + SOURCE_URL[0]=http://${SPELL}.tuxfamily.org/releases/${SOURCE} + SOURCE_HASH=sha512:8ca441587d062d9e497ae733b5dbf51dda786625d4e640b0918e7b1a4b812b808941759158aadfa047ce98525906ea74eec89b0f63e2fe858a8a4e7c20193b92 +SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}" + WEB_SITE="http://cola.tuxfamily.org" + LICENSE[0]=GPL2 + ENTERED=20080801 + SHORT="a highly caffeninated git gui" +cat << EOF +git-cola: a highly caffeinated git gui + +Cola is a sweet, carbonated git gui known for its sugary flavour and +caffeine-inspired features. +EOF diff --git a/collab/cola/HISTORY b/collab/cola/HISTORY new file mode 100644 index 0000000000..4b3cc7a717 --- /dev/null +++ b/collab/cola/HISTORY @@ -0,0 +1,3 @@ +2008-08-01 George Sherwood <gsherwood@sourcemage.org> + * DEPENDS, DETAILS, BUILD, INSTALL: spell created + diff --git a/collab/cola/INSTALL b/collab/cola/INSTALL new file mode 100755 index 0000000000..73dc1990b5 --- /dev/null +++ b/collab/cola/INSTALL @@ -0,0 +1,4 @@ +cd $SOURCE_DIRECTORY && +cp -v bin/* $INSTALL_ROOT/usr/bin/ && +mkdir -p $INSTALL_ROOT/usr/share/cola && +cp -vrp share/cola/* $INSTALL_ROOT/usr/share/cola diff --git a/crypto/loop-aes/DETAILS b/crypto/loop-aes/DETAILS index f3a672b98b..8ce34d1803 100755 --- a/crypto/loop-aes/DETAILS +++ b/crypto/loop-aes/DETAILS @@ -1,5 +1,6 @@ SPELL=loop-aes VERSION=3.2c + PATCHLEVEL=1 SOURCE=loop-AES-v$VERSION.tar.bz2 SOURCE2=$SOURCE.sign SOURCE_DIRECTORY=$BUILD_DIRECTORY/loop-AES-v$VERSION diff --git a/crypto/loop-aes/HISTORY b/crypto/loop-aes/HISTORY index 6df37c931b..637fb2639a 100644 --- a/crypto/loop-aes/HISTORY +++ b/crypto/loop-aes/HISTORY @@ -1,3 +1,7 @@ +2008-08-02 Vlad Glagolev <stealth@sourcemage.org> + * INSTALL: use correct kernel source path after the kernel renewal + * DETAILS: PATCHLEVEL+=1 + 2008-07-24 Vlad Glagolev <stealth@sourcemage.org> * init.d/losetup: use crypt_fs provider * INSTALL: quoting the paths! diff --git a/crypto/loop-aes/INSTALL b/crypto/loop-aes/INSTALL index e1fcfdfe2d..c6ae227193 100755 --- a/crypto/loop-aes/INSTALL +++ b/crypto/loop-aes/INSTALL @@ -1,9 +1,9 @@ make_single && if [[ $LAES_EXTRA_CIPHERS == y ]]; then - make EXTRA_CIPHERS=y + make EXTRA_CIPHERS=y LINUX_SOURCE="$BUILD_DIRECTORY/linux" else - make + make LINUX_SOURCE="$BUILD_DIRECTORY/linux" fi && make_normal && diff --git a/devel/dev86/HISTORY b/devel/dev86/HISTORY index 2d9187df02..7225269b65 100644 --- a/devel/dev86/HISTORY +++ b/devel/dev86/HISTORY @@ -1,3 +1,7 @@ +2008-08-01 Julien "_kaze_" ROZO <julien@rozo.org> + * PRE_BUILD, dev86-noelks.patch: disables the build of elks on x86_64 arch, + fixes bug #14160 + 2008-07-14 Juuso Alasuutari <iuso@sourcemage.org> * BUILD: Forced single-job build, removed sedits. * PRE_BUILD: Added, moved sedits here. diff --git a/devel/dev86/PRE_BUILD b/devel/dev86/PRE_BUILD index ccf3173f0d..ab7e2f6e69 100755 --- a/devel/dev86/PRE_BUILD +++ b/devel/dev86/PRE_BUILD @@ -1,5 +1,10 @@ default_pre_build && cd "$SOURCE_DIRECTORY" && +# fix for bug 14160 +if [[ ${SMGL_COMPAT_ARCHS[1]} == "x86_64" ]]; then + patch -p1 < $SCRIPT_DIRECTORY/dev86-noelks.patch +fi && + sed -i "s|-O2|$CFLAGS|" Makefile && sed -i "s|/man/|/share/man/|" Makefile diff --git a/devel/dev86/dev86-noelks.patch b/devel/dev86/dev86-noelks.patch new file mode 100644 index 0000000000..9fd46e9577 --- /dev/null +++ b/devel/dev86/dev86-noelks.patch @@ -0,0 +1,15 @@ +--- dev86-0.16.17/makefile.in.noelks 2006-01-25 17:03:02.000000000 -0500 ++++ dev86-0.16.17/makefile.in 2006-01-25 17:03:19.000000000 -0500 +@@ -89,10 +89,10 @@ + + #ifdef GNUMAKE + all: check_config bcc86 cpp unproto copt as86 ar86 ld86 objdump86 \ +- library lib-bsd alt-libs elksemu ++ library lib-bsd alt-libs + + install: check_config install-bcc install-man \ +- install-lib install-emu ++ install-lib + + install-all: install install-other + diff --git a/disk/partimage-ng/BUILD b/disk/partimage-ng/BUILD new file mode 100755 index 0000000000..760e1eb5a9 --- /dev/null +++ b/disk/partimage-ng/BUILD @@ -0,0 +1,2 @@ +cmake_build + diff --git a/disk/partimage-ng/DEPENDS b/disk/partimage-ng/DEPENDS new file mode 100755 index 0000000000..48fbf748e0 --- /dev/null +++ b/disk/partimage-ng/DEPENDS @@ -0,0 +1,8 @@ +depends cmake && +depends g++ && +depends parted && +depends ntfsprogs && +depends e2fsprogs +#optional_depends ntfsprogs '' '' 'NTFS support' && +#optional_depends e2fsprogs '' '' 'ext2/ext3 support' + diff --git a/disk/partimage-ng/DETAILS b/disk/partimage-ng/DETAILS new file mode 100755 index 0000000000..da4498b809 --- /dev/null +++ b/disk/partimage-ng/DETAILS @@ -0,0 +1,25 @@ + SPELL=partimage-ng + VERSION=r80 + SOURCE_HASH=sha512:7e2642fb957f58f9c17e50918b5d8a78266e56686fb0bb5cff6c2cc789b0835738d07c7f23c891a82098641a473c2646a9a12180315db683c14de24b52396cfd + SOURCE=$SPELL-$VERSION.tar.gz +# SOURCE2=$SOURCE.sig +SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL +SOURCE_URL[0]=https://launchpad.net/partimage-ng/devel/$VERSION/+download/$SOURCE +# SOURCE2_URL[0]=${SOURCE_URL[0]}.sig +# SOURCE_GPG=gnu.gpg:$SOURCE.sig:UPSTREAM_KEY +# SOURCE2_IGNORE=signature + WEB_SITE=http://partimage-ng.org + LICENSE[0]=GPL + ENTERED=20080224 + KEYWORDS="disk" + SHORT="disk and partition imaging program" +cat << EOF +Partimage-ng is a disk and partition imaging program. It allows you to create +exact images of single partitions or whole drives (including partition tables +so you don't need to recreate them manually). Partimage-ng does its job by +manipulating the low level filesystem structures and saving only the used +filesystem data blocks (sometimes referred to as clusters). Thus partimage-ng +needs to "understand" the layout of the filesystem it is trying to create an +image of. Currently it supports ext2, ext3, linux-swap, NTFS, and FAT32 (but +not FAT16) filesystems. +EOF diff --git a/disk/partimage-ng/DOWNLOAD b/disk/partimage-ng/DOWNLOAD new file mode 100755 index 0000000000..a499270baa --- /dev/null +++ b/disk/partimage-ng/DOWNLOAD @@ -0,0 +1,2 @@ +cd $SOURCE_CACHE && +wget --secure-protocol=auto --no-check-certificate $SOURCE_URL diff --git a/disk/partimage-ng/HISTORY b/disk/partimage-ng/HISTORY new file mode 100644 index 0000000000..176a00775a --- /dev/null +++ b/disk/partimage-ng/HISTORY @@ -0,0 +1,5 @@ +2008-02-24 Treeve Jelbert <treeve@sourcemage.org> + * DETAILS: version r80 + * PRE_BUILD: fix compile with latest glibc + spell created + diff --git a/disk/partimage-ng/PRE_BUILD b/disk/partimage-ng/PRE_BUILD new file mode 100755 index 0000000000..69b061939b --- /dev/null +++ b/disk/partimage-ng/PRE_BUILD @@ -0,0 +1,5 @@ +default_pre_build && +cd $SOURCE_DIRECTORY && +sed -i -e '/<fcntl.h>/ a\ +#include <langinfo.h> +' src/imager.cpp diff --git a/gnome2-apps/gnucash/DEPENDS b/gnome2-apps/gnucash/DEPENDS index dd5ec5955a..b84680ee59 100755 --- a/gnome2-apps/gnucash/DEPENDS +++ b/gnome2-apps/gnucash/DEPENDS @@ -1,4 +1,4 @@ -depends -sub CAIRO goffice-dev && +depends -sub CAIRO goffice && depends gtkhtml2 && depends guile && depends libart_lgpl && @@ -26,7 +26,7 @@ optional_depends libofx \ '--disable-ofx' \ 'to compile with ofx support' && -optional_depends aqbanking2 \ +optional_depends aqbanking \ '--enable-hbci' \ '--disable-hbci' \ 'to enable HBCI support' && diff --git a/gnome2-apps/gnucash/DETAILS b/gnome2-apps/gnucash/DETAILS index 4bc88d283b..bb9d82d9f6 100755 --- a/gnome2-apps/gnucash/DETAILS +++ b/gnome2-apps/gnucash/DETAILS @@ -1,5 +1,5 @@ SPELL=gnucash - VERSION=2.2.5 + VERSION=2.2.6 SOURCE=${SPELL/2/}-$VERSION.tar.gz # SOURCE2=${SPELL/2/}-$VERSION.tar.gz.sig SOURCE_URL[0]=${SOURCEFORGE_URL}/${SPELL/2/}/${SOURCE} @@ -7,7 +7,7 @@ # SOURCE2_URL[0]=${SOURCE_URL[0]}.sig # SOURCE2_IGNORE=signature # SOURCE_GPG=gnucash-pubkey.key:$SOURCE2:UPSTREAM_KEY - SOURCE_HASH=sha512:6ce4814ff9ecd943fe9cf04dbd62b38d2c316e3df0103fb9e6eef6c43bfc7d26ca839419cae90b04229dcd9a57e5d788c7194ed232ff75d9f9ffa4a4206d95b2 + SOURCE_HASH=sha512:baee0e3bd0fba8e0029081156b3f55e17901fdd9850b78da540ca2a98af5c4bba84e1c28932774aeeb200b5d93e562316d7d0c7f8a4cd386bdc386c283cf43e3 SOURCE_DIRECTORY=$BUILD_DIRECTORY/${SPELL/2/}-$VERSION WEB_SITE=http://www.gnucash.org ENTERED=20011105 diff --git a/gnome2-apps/gnucash/HISTORY b/gnome2-apps/gnucash/HISTORY index af47410463..f41c672991 100644 --- a/gnome2-apps/gnucash/HISTORY +++ b/gnome2-apps/gnucash/HISTORY @@ -1,3 +1,7 @@ +2008-08-01 George Sherwood <gsherwood@sourcemage.org> + * DETAILS: Updated to version 2.2.6 + * DEPENDS: depends goffice. depends aqbanking + 2008-04-28 George Sherwood <george@beernabeer.com> * DETAILS: Updated to version 2.2.5 diff --git a/http/links-twibright/DETAILS b/http/links-twibright/DETAILS index 40158e297e..f3adce0e53 100755 --- a/http/links-twibright/DETAILS +++ b/http/links-twibright/DETAILS @@ -1,15 +1,14 @@ SPELL=links-twibright - VERSION=2.1 + VERSION=2.2 SOURCE_NAME=links SOURCE=$SOURCE_NAME-$VERSION.tar.bz2 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SOURCE_NAME-$VERSION SOURCE_URL[0]=http://links.twibright.com/download/$SOURCE - SOURCE_HASH=sha512:555ca315024c867637e61522fd543b0663d2a9c06dd91d00dea5be3b149cdd12882cc3ea5f2b18ff9fe90f311ed1208ac54105e9904c286ee040f04a0e6f696a + SOURCE_HASH=sha512:8e2cc0dcbfd853807c6c53c357c716abf23ea24f107bafb2502d5dbeebad5a009696a188621bffd0e2e532391216a6d00a4538d59e4ea89ea982d5506fe51e56 LICENSE[0]=GPL WEB_SITE=http://links.twibright.com/ ENTERED=20011027 SECURITY_PATCH=1 - PATCHLEVEL=0 KEYWORDS="http" SHORT='Advanced text browser with an optional GUI' cat << EOF diff --git a/http/links-twibright/HISTORY b/http/links-twibright/HISTORY index 39bc9557b0..e13d608341 100644 --- a/http/links-twibright/HISTORY +++ b/http/links-twibright/HISTORY @@ -1,3 +1,6 @@ +2008-08-01 George Sherwood <gsherwood@sourcemage.org> + * DETAILS: Updated to version 2.2 + 2008-07-06 Ladislav Hagara <hgr@vabo.cz> * DETAILS: 2.1 diff --git a/kernels/linux/HISTORY b/kernels/linux/HISTORY index f42cc093ca..6bcb7469f2 100644 --- a/kernels/linux/HISTORY +++ b/kernels/linux/HISTORY @@ -1,3 +1,7 @@ +2008-08-02 Vlad Glagolev <stealth@sourcemage.org> + * latest.defaults: updated latest to patch-2.6.26.1 + * info/patches/maintenance_patches/patch-2.6.26.1: added + 2008-07-14 Ladislav Hagara <hgr@vabo.cz> * latest.defaults: 2.6.26 * info/kernels/2.6.26: added diff --git a/kernels/linux/info/patches/maintenance_patches/patch-2.6.26.1 b/kernels/linux/info/patches/maintenance_patches/patch-2.6.26.1 new file mode 100755 index 0000000000..06fe7c38fb --- /dev/null +++ b/kernels/linux/info/patches/maintenance_patches/patch-2.6.26.1 @@ -0,0 +1,6 @@ +appliedkernels="2.6.26" +patchversion="${appliedkernels}.1" +source="patch-${patchversion}.bz2" +source_url="${KERNEL_URL}/pub/linux/kernel/v2.6/${source}" +source_gpg="kernel.gpg:${source}.sign:ESTABLISHED_UPSTREAM_KEY" +gpg_source_url="${source_url}.sign" diff --git a/kernels/linux/latest.defaults b/kernels/linux/latest.defaults index 5fd9db4599..2cf2265a28 100644 --- a/kernels/linux/latest.defaults +++ b/kernels/linux/latest.defaults @@ -1,6 +1,6 @@ LATEST_2_6=2.6.26 LATEST_PRE_2_6=patch-2.6.26 -LATEST_maintenance_patches=patch-2.6.26 +LATEST_maintenance_patches=patch-2.6.26.1 LATEST_git_patches=patch-2.6.25-rc6-git7 LATEST_2_4=2.4.32 LATEST_PRE_2_4=patch-2.4.33-pre1 diff --git a/mail/thunderbird/HISTORY b/mail/thunderbird/HISTORY index b268252712..cc16ed6340 100644 --- a/mail/thunderbird/HISTORY +++ b/mail/thunderbird/HISTORY @@ -1,3 +1,7 @@ +2008-08-02 Julien "_kaze_" ROZO <julien@rozo.org + * PRE_BUILD, enigmail_visibility.patch: fixed compilation problem when + enigmail is enabled, fixes bug #14516 + 2008-07-25 Ladislav Hagara <hgr@vabo.cz> * DETAILS: 2.0.0.16, SECURITY_PATCH=13 diff --git a/mail/thunderbird/PRE_BUILD b/mail/thunderbird/PRE_BUILD index 9e3013f441..ed5d3b0f3b 100755 --- a/mail/thunderbird/PRE_BUILD +++ b/mail/thunderbird/PRE_BUILD @@ -7,5 +7,6 @@ cp mail/config/mozconfig .mozconfig && if [ "$BUILD_ENIGMAIL" = "y" ]; then cd mailnews/extensions && - unpack_file 3 + unpack_file 3 && + patch -p0 < ${SPELL_DIRECTORY}/enigmail_visibility.patch fi diff --git a/mail/thunderbird/enigmail_visibility.patch b/mail/thunderbird/enigmail_visibility.patch new file mode 100644 index 0000000000..1bd5f406ad --- /dev/null +++ b/mail/thunderbird/enigmail_visibility.patch @@ -0,0 +1,12 @@ +--- enigmail/build/nsEnigModule.cpp 2006-05-20 23:47:30.000000000 +0200 ++++ enigmail/build/nsEnigModule.cpp~ 2007-09-30 12:35:16.000000000 +0200 +@@ -34,7 +34,9 @@ + * + * ***** END LICENSE BLOCK ***** */ + ++#pragma GCC visibility push(default) + #include "nsIGenericFactory.h" ++#pragma GCC visibility pop + #include "nsEnigModule.h" + + #include "nsEnigMsgCompose.h" diff --git a/printer/ghostscript/DETAILS b/printer/ghostscript/DETAILS index 5f0e8c09c3..12fbeb9f86 100755 --- a/printer/ghostscript/DETAILS +++ b/printer/ghostscript/DETAILS @@ -1,6 +1,6 @@ SPELL=ghostscript - VERSION=8.62 - SOURCE_HASH=sha512:2b2f4d8cf21a4d5d4dec59caea2b9fcb8a35ef37d738e4eab34a7792d9347e62a129a6e49d488075eaee3543274a5564d7d63d2bcc2a5ea5da49100f6ab19205 + VERSION=8.63 + SOURCE_HASH=sha512:828b985c20633900c6448769f3eeda4d024ad3cf35cec0fa323e821d472c42599d0d8527c3264b39ba2581879bb5eff3315b9319a3abb81f53eec323db9504df SOURCE=$SPELL-$VERSION.tar.bz2 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE diff --git a/printer/ghostscript/HISTORY b/printer/ghostscript/HISTORY index 55a31805f5..f755d8c35e 100644 --- a/printer/ghostscript/HISTORY +++ b/printer/ghostscript/HISTORY @@ -1,3 +1,6 @@ +2008-08-01 Treeve Jelbert <treeve@sourcemage.org> + * DETAILS: version 8.63 + 2008-03-22 Eric Sandall <sandalle@sourcemage.org> * DEPENDS: Depends on e2fsprogs for libcom_err diff --git a/video-libs/libebml/DETAILS b/video-libs/libebml/DETAILS index b2a7f5da1c..02f7dcce1f 100755 --- a/video-libs/libebml/DETAILS +++ b/video-libs/libebml/DETAILS @@ -1,5 +1,5 @@ SPELL=libebml - VERSION=0.7.7 + VERSION=0.7.8 SOURCE=$SPELL-$VERSION.tar.bz2 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION SOURCE_URL[0]=http://dl.matroska.org/downloads/$SPELL/$SOURCE diff --git a/video-libs/libebml/HISTORY b/video-libs/libebml/HISTORY index 1bc06a74c3..2347d6ec2a 100644 --- a/video-libs/libebml/HISTORY +++ b/video-libs/libebml/HISTORY @@ -1,3 +1,6 @@ +2008-08-01 Julien "_kaze_" ROZO <julien@rozo.org> + * DETAILS: updated version to 0.7.8 + 2006-10-03 Juuso Alasuutari <iuso@sourcemage.org> * DETAILS: [automated] Removed UPDATED. diff --git a/video-libs/libebml/libebml-0.7.7.tar.bz2.sig b/video-libs/libebml/libebml-0.7.7.tar.bz2.sig Binary files differdeleted file mode 100644 index 21a4723fd2..0000000000 --- a/video-libs/libebml/libebml-0.7.7.tar.bz2.sig +++ /dev/null diff --git a/video-libs/libebml/libebml-0.7.8.tar.bz2.sig b/video-libs/libebml/libebml-0.7.8.tar.bz2.sig Binary files differnew file mode 100644 index 0000000000..38274da2b4 --- /dev/null +++ b/video-libs/libebml/libebml-0.7.8.tar.bz2.sig |