diff options
author | Thomas Orgis | 2014-08-27 00:13:46 +0200 |
---|---|---|
committer | Thomas Orgis | 2014-08-27 00:13:46 +0200 |
commit | aaaff8abd00b4ac3948a7a18ba941f6fefff3cd2 (patch) | |
tree | fb5605bef19725bf3bf556f96fa61fef01dba369 | |
parent | 8be26e1686b1ce14d329f4c0d71216ad8a1d6770 (diff) | |
parent | a9d2c4e4f1944afbb8e7ec124118788089527b3f (diff) |
Merge branch 'master' into devel-xorg-modular
Conflicts:
ChangeLog
e-17/ecore/HISTORY
xorg-xserver/xorg-server/DEPENDS
xorg-xserver/xorg-server/HISTORY
101 files changed, 475 insertions, 92 deletions
@@ -1,3 +1,6 @@ +2014-08-24 Thomas Orgis <sobukus@souremage.org> + * audio-libs/aubio03: old copy of aubio for ardour2 + 2014-08-22 Vlad Glagolev <stealth@sourcemage.org> * audio-soft/wavegain: new spell, wav files loudness normalizer diff --git a/audio-creation/ardour2/BUILD b/audio-creation/ardour2/BUILD index d3233085f5..3cc68a007b 100755 --- a/audio-creation/ardour2/BUILD +++ b/audio-creation/ardour2/BUILD @@ -1,3 +1,4 @@ +PKG_CONFIG_PATH="$INSTALL_ROOT/opt/aubio03/lib/pkgconfig:$PKG_CONFIG_PATH" \ scons -j$MAKE_NJOBS "PREFIX=$INSTALL_ROOT/usr" $OPTS \ SYSLIBS=1 \ $ARDOUR2_SURFACES \ diff --git a/audio-creation/ardour2/DEPENDS b/audio-creation/ardour2/DEPENDS index ea0847a202..25d9e87466 100755 --- a/audio-creation/ardour2/DEPENDS +++ b/audio-creation/ardour2/DEPENDS @@ -15,7 +15,7 @@ depends gtkmm2 && depends libgnomecanvas && depends libgnomecanvasmm && depends boost && -depends aubio && +depends aubio03 && depends liblo && depends alsa-lib && depends libsamplerate && @@ -26,7 +26,7 @@ depends libsigc++2 && depends soundtouch depends gtk-engines2 && -optional_depends slv2 \ +optional_depends lilv-0 \ "LV2=1" \ "LV2=0" \ "for LV2 plugin support" && diff --git a/audio-creation/ardour2/HISTORY b/audio-creation/ardour2/HISTORY index fe37256fa7..58951298e3 100644 --- a/audio-creation/ardour2/HISTORY +++ b/audio-creation/ardour2/HISTORY @@ -1,3 +1,8 @@ +2014-08-24 Thomas Orgis <sobukus@sourcemage.org> + DEPENDS, PRE_BUILD, BUILD, INSTALL: Keep it building with old version + of aubio, fixed lv2 dep. Note for the future: Ardour 2 is not obsoleted by + Ardour 3! Import of old sessions in the latter is not lossless, sadly. + 2013-10-23 Thomas Orgis <sobukus@sourcemage.org> * PRE_BUILD, ardour-2.8.16-lilv16.patch: build fix from https://abf.rosalinux.ru/openmandriva/ardour/raw/master/ardour-2.8.16-lilv16.patch diff --git a/audio-creation/ardour2/INSTALL b/audio-creation/ardour2/INSTALL index b7e83d03d7..78e35a6bc0 100755 --- a/audio-creation/ardour2/INSTALL +++ b/audio-creation/ardour2/INSTALL @@ -1 +1,2 @@ +PKG_CONFIG_PATH="$INSTALL_ROOT/opt/aubio03/lib/pkgconfig:$PKG_CONFIG_PATH" \ scons install diff --git a/audio-creation/ardour2/PRE_BUILD b/audio-creation/ardour2/PRE_BUILD index 8543e88553..a6b66c6a25 100755 --- a/audio-creation/ardour2/PRE_BUILD +++ b/audio-creation/ardour2/PRE_BUILD @@ -6,4 +6,10 @@ patch -p1 < "$SPELL_DIRECTORY/ardour-2.8.16-lilv16.patch" && sed -i "s:soundtouch-1.0:soundtouch-1.4:" SConstruct && # Brute force lib64 killing. -sed -i "s:lib64:lib:" SConstruct +sed -i "s:lib64:lib:" SConstruct && +# Just setting pkgconfig path may work, too. +# Nope, configuration stage fings aubio, but fails to use the flags to find +# the header. So, enforcing is back in. +# Force old aubio lib into the build. +# I hate scons. -- ThOr +perl -pi -e "s:CPPPATH = \[ '\.' \]:CPPPATH = [ '.', '$INSTALL_ROOT/opt/aubio03/include' ], LIBPATH = [ '$INSTALL_ROOT/opt/aubio03/lib']:" SConstruct diff --git a/audio-creation/audacity/DEPENDS b/audio-creation/audacity/DEPENDS index 895c3f3ec7..32eac44a3d 100755 --- a/audio-creation/audacity/DEPENDS +++ b/audio-creation/audacity/DEPENDS @@ -1,5 +1,5 @@ depends zip && -if [[ "$AUDACITY_BRANCH" == "current" ]]; then +if [[ "$AUDACITY_UNI" == "no" ]]; then depends wxgtk-no-unicode else depends wxgtk diff --git a/audio-creation/audacity/DETAILS b/audio-creation/audacity/DETAILS index 6ac18d08f9..0eaae5badb 100755 --- a/audio-creation/audacity/DETAILS +++ b/audio-creation/audacity/DETAILS @@ -9,10 +9,10 @@ in scm) FORCE_DOWNLOAD=on SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-cvs ;; *) - VERSION=2.0.2 - SOURCE=${SPELL}-minsrc-${VERSION}.tar.bz2 - SOURCE_URL[0]=http://audacity.googlecode.com/files/${SOURCE} - SOURCE_HASH=sha512:3099c01b099306ee77c3df569a7412c230006ba8e7f85d6e79f0bc0373cc4c95f231aab7e1bde0d297afa3c1db7fe6dc125715d803dc78a47df4b716d7423d2e + VERSION=2.0.5 + SOURCE=${SPELL}-minsrc-${VERSION}.tar.xz + SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/files/$SOURCE + SOURCE_HASH=sha512:d126068e9916072a3c23809074a0a8eff2c3121663f37ee15680ec2731b540fa2d083f3e2eecdd3c288462fa164ffaf9e6cdb1c9e84a25af3fa8046ee6798004 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-src-$VERSION ;; esac WEB_SITE=http://audacity.sourceforge.net/ diff --git a/audio-creation/audacity/HISTORY b/audio-creation/audacity/HISTORY index 0425af02ac..b0f177cc91 100644 --- a/audio-creation/audacity/HISTORY +++ b/audio-creation/audacity/HISTORY @@ -1,3 +1,7 @@ +2014-08-24 Thomas Orgis <sobukus@sourcemage.org> + * DETAILS: bump to 2.0.5 + * DEPENDS: use AUDACITY_UNI for unicode decision + 2014-07-03 Ismael Luceno <ismael@sourcemage.org> * DETAILS: Use get_scm_version diff --git a/audio-drivers/jack2/DETAILS b/audio-drivers/jack2/DETAILS index 751a9bebd5..e82467aa52 100755 --- a/audio-drivers/jack2/DETAILS +++ b/audio-drivers/jack2/DETAILS @@ -10,10 +10,10 @@ if [[ $JACK2_BRANCH == scm ]]; then FORCE_DOWNLOAD=1 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-svn" else - VERSION=1.9.9.5 # Officially, it is called 1.9.9, but the tarball says 1.9.9.5 . + VERSION=1.9.10 SOURCE=$SPELLX-$VERSION.tar.bz2 SOURCE_URL[0]=http://jackaudio.org/downloads/$SOURCE - SOURCE_HASH=sha512:173a10943c98cb17f0041216cc24ce03d5e147f27be121fdf66c4e9d21ba8bf125a1749b985cacffb075618d92025231eb047c754d33d777275373d010a85e27 + SOURCE_HASH=sha512:d64d233c2d626a4ae635f009a7209c2c8740c7959988d282e733b5fc663c168301a2aa2b517dff80f44cb25417aeb5ccca87da5c24616dadf38d69a6cb307e7c SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELLX-$VERSION" fi WEB_SITE=http://jackaudio.org/ diff --git a/audio-drivers/jack2/HISTORY b/audio-drivers/jack2/HISTORY index ee09ab7557..9549c96b73 100644 --- a/audio-drivers/jack2/HISTORY +++ b/audio-drivers/jack2/HISTORY @@ -1,3 +1,6 @@ +2014-08-24 Thomas Orgis <sobukus@sourcemage.org> + * DETAILS: updated spell to 1.9.10 + 2014-07-03 Ismael Luceno <ismael@sourcemage.org> * DETAILS: Use get_scm_version diff --git a/audio-drivers/libffado/DEPENDS b/audio-drivers/libffado/DEPENDS index 7021d64741..7e85a8bea7 100755 --- a/audio-drivers/libffado/DEPENDS +++ b/audio-drivers/libffado/DEPENDS @@ -7,6 +7,7 @@ depends libxml++ && depends libraw1394 && depends libiec61883 && depends libavc1394 && +depends libconfig && depends dbus && depends dbus-c++ && depends -sub CXX gcc && diff --git a/audio-drivers/libffado/HISTORY b/audio-drivers/libffado/HISTORY index 1fcba89a1a..ad5d3ec0a0 100644 --- a/audio-drivers/libffado/HISTORY +++ b/audio-drivers/libffado/HISTORY @@ -1,3 +1,6 @@ +2014-08-24 Thomas Orgis <sobukus@sourcemage.org> + * DEPENDS: libconfig + 2014-07-03 Ismael Luceno <ismael@sourcemage.org> * DETAILS: Use get_scm_version diff --git a/audio-libs/aubio03/BUILD b/audio-libs/aubio03/BUILD new file mode 100755 index 0000000000..b68d0f8cde --- /dev/null +++ b/audio-libs/aubio03/BUILD @@ -0,0 +1,5 @@ +cd "$SOURCE_DIRECTORY" && +# Stupid, stupid! +export LDFLAGS="$LDFLAGS -lm" && +./configure $OPTS --prefix="$INSTALL_ROOT/opt/aubio03" && +make diff --git a/audio-libs/aubio03/DEPENDS b/audio-libs/aubio03/DEPENDS new file mode 100755 index 0000000000..26e106fa25 --- /dev/null +++ b/audio-libs/aubio03/DEPENDS @@ -0,0 +1,18 @@ +depends libsndfile && +depends libsamplerate && +depends fftw && + +optional_depends alsa-lib \ + "--enable-alsa" \ + "--disable-alsa" \ + "for ALSA support" && + +optional_depends JACK-DRIVER \ + "--enable-jack" \ + "--disable-jack" \ + "for JACK support" && + +optional_depends lash \ + "--enable-lash" \ + "--disable-lash" \ + "for LASH support (it will force alsa and jack depends)" diff --git a/audio-libs/aubio03/DETAILS b/audio-libs/aubio03/DETAILS new file mode 100644 index 0000000000..af8440c4c2 --- /dev/null +++ b/audio-libs/aubio03/DETAILS @@ -0,0 +1,23 @@ + SPELL=aubio03 + VERSION=0.3.2 + SOURCE=aubio-$VERSION.tar.gz + SOURCE_URL[0]=http://aubio.org/pub/$SOURCE + SOURCE_HASH=sha512:b3d8445716c0cde02ee1e7b036864598ec7562d8a938a61f644c384d80e95601abcb6e713cdaab7b2613f6f4f27db1cfafa7c23824c61f504e83d11fefdee8fc +SOURCE_DIRECTORY=$BUILD_DIRECTORY/aubio-$VERSION + WEB_SITE=http://aubio.org/ + LICENSE[0]=GPL + ENTERED=20080710 + SHORT="library for audio labelling" +cat << EOF +This is an old version there only to make Ardour2 work! + +aubio is a library for audio labelling. Its features include segmenting a +sound file before each of its attacks, performing pitch detection, tapping the +beat and producing midi streams from live audio. The name aubio comes from +'audio' with a typo: several transcription errors are likely to be found in +the results too. + +The aim of this project is to provide these automatic labelling features to +other audio softwares. Functions can be used offline in sound editors and +software samplers, or online in audio effects and virtual instruments. +EOF diff --git a/audio-libs/aubio03/HISTORY b/audio-libs/aubio03/HISTORY new file mode 100644 index 0000000000..386d8c088a --- /dev/null +++ b/audio-libs/aubio03/HISTORY @@ -0,0 +1,6 @@ +2014-08-24 Thomas Orgis <sobukus@sourcemage.org> + * DETAILS, DEPENDS, BUILD: install old version of spell to /opt/aubio03 as + prerequesite for ardour2 + +2008-07-10 Vlad Glagolev <stealth@sourcemage.org> + * DEPENDS, DETAILS: spell created diff --git a/audio-libs/lilv-0/HISTORY b/audio-libs/lilv-0/HISTORY index 07d457ff08..84d7695f65 100644 --- a/audio-libs/lilv-0/HISTORY +++ b/audio-libs/lilv-0/HISTORY @@ -1,3 +1,6 @@ +2014-08-24 Thomas Orgis <sobukus@sourcemage.org> + * INSTALL: fail-safe cleanup of non-libraries + 2013-10-23 Thomas Orgis <sobukus@sourcemage.org> * DETAILS, DEPENDS, BUILD, INSTALL: created diff --git a/audio-libs/lilv-0/INSTALL b/audio-libs/lilv-0/INSTALL index 54ea83873a..8d809b88de 100755 --- a/audio-libs/lilv-0/INSTALL +++ b/audio-libs/lilv-0/INSTALL @@ -1,4 +1,4 @@ ./waf install --destdir=".pre-install" && -rm -rv .pre-install/usr/{bin,etc,share/man} && +rm -rvf .pre-install/usr/{bin,etc,share/man} && # cp -a complains about inability to preserve times for symlinks cp -rv .pre-install/* "$INSTALL_ROOT/" diff --git a/audio-libs/lv2/HISTORY b/audio-libs/lv2/HISTORY index 7d9c040f73..d141342511 100644 --- a/audio-libs/lv2/HISTORY +++ b/audio-libs/lv2/HISTORY @@ -1,3 +1,6 @@ +2014-08-24 Thomas Orgis <sobukus@sourcemage.org> + * INSTALL: pre-create directory + 2013-10-23 Thomas Orgis <sobukus@sourcemage.org> * BUILD, DEPENDS, DETAILS, INSTALL: spell created * CONFLICTS: replaces lv2core diff --git a/audio-libs/lv2/INSTALL b/audio-libs/lv2/INSTALL index 0ea15ccab7..6af2edc071 100755 --- a/audio-libs/lv2/INSTALL +++ b/audio-libs/lv2/INSTALL @@ -1 +1,3 @@ +# Too dumb to use mkdir -p in waf? +mkdir -p "$INSTALL_ROOT/usr/lib/lv2" && waf_install diff --git a/audio-libs/slv2/DEPENDS b/audio-libs/slv2/DEPENDS index 0a13f7c6c9..569adcccc0 100755 --- a/audio-libs/slv2/DEPENDS +++ b/audio-libs/slv2/DEPENDS @@ -1,5 +1,5 @@ depends python && -depends lv2core && +depends lv2 && depends redland && optional_depends JACK-DRIVER \ diff --git a/audio-libs/slv2/HISTORY b/audio-libs/slv2/HISTORY index 1694755cfb..2c498672a9 100644 --- a/audio-libs/slv2/HISTORY +++ b/audio-libs/slv2/HISTORY @@ -1,3 +1,6 @@ +2014-08-24 Thomas Orgis <sobukus@sourcemage.org> + * DEPENDS: depend on lv2 instead of lv2core + 2011-10-22 Thomas Orgis <sobukus@sourcemage.org> * DETAILS: Updated to 0.6.6. diff --git a/audio-players/xmms2/CONFIGURE b/audio-players/xmms2/CONFIGURE index bab1c79e4d..1c5107e9d3 100755 --- a/audio-players/xmms2/CONFIGURE +++ b/audio-players/xmms2/CONFIGURE @@ -149,11 +149,12 @@ config_query_option XMMS2_OPTS \ y \ "--with-plugins=wave" \ "--without-plugins=wave" && -config_query_option XMMS2_OPTS \ - "Do you want CDDA support" \ - y \ - "--with-plugins=cdda" \ - "--without-plugins=cdda" && +# Does not build without CDDA. +#config_query_option XMMS2_OPTS \ +# "Do you want CDDA support" \ +# y \ +# "--with-plugins=cdda" \ +# "--without-plugins=cdda" && config_query_option XMMS2_OPTS \ "Do you want GVFS support" \ y \ diff --git a/audio-players/xmms2/DEPENDS b/audio-players/xmms2/DEPENDS index a6df3fe8a0..8580b7f86f 100755 --- a/audio-players/xmms2/DEPENDS +++ b/audio-players/xmms2/DEPENDS @@ -4,10 +4,9 @@ depends glib2 && #Transport plugins && if list_find "$XMMS2_OPTS" "--with-xmms2d" ; then - if list_find "$XMMS2_OPTS" "--with-plugins=cdda" ; then +# CDDA plugin is required. depends libcdio && depends libdiscid - fi && if list_find "$XMMS2_OPTS" "--with-plugins=xspf" || list_find "$XMMS2_OPTS" "--with-plugins=xml" || list_find "$XMMS2_OPTS" "--with-plugins=rss" diff --git a/audio-players/xmms2/HISTORY b/audio-players/xmms2/HISTORY index 6c90a3c8a9..72826c87bf 100644 --- a/audio-players/xmms2/HISTORY +++ b/audio-players/xmms2/HISTORY @@ -1,3 +1,6 @@ +2014-08-24 Thomas Orgis <sobukus@sourcemage.org> + CONFIGURE, DEPENDS: always build with CDDA (breaks otherwise) + 2011-10-31 Andraž "ruskie" Levstik <ruskie+f03a580f@codemages.net> * DETAILS: updated spell to 0.8DrO_o * PRE_BUILD: no more patching diff --git a/audio-plugins/swh-plugins/HISTORY b/audio-plugins/swh-plugins/HISTORY index 88cb9e15d3..88472fb9b2 100644 --- a/audio-plugins/swh-plugins/HISTORY +++ b/audio-plugins/swh-plugins/HISTORY @@ -1,3 +1,6 @@ +2014-08-24 Thomas Orgis <sobukus@sourcemage.org> + * PRE_BUILD: fix build with current autotools + 2014-03-18 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de> * swh-plugins-nosetlocale.patch: add missing file diff --git a/audio-plugins/swh-plugins/PRE_BUILD b/audio-plugins/swh-plugins/PRE_BUILD index 7899656681..a61ccfedbf 100755 --- a/audio-plugins/swh-plugins/PRE_BUILD +++ b/audio-plugins/swh-plugins/PRE_BUILD @@ -5,6 +5,9 @@ patch -p1 < $SPELL_DIRECTORY/swh-plugins-0.4.15-gettext.patch && patch -p1 < $SPELL_DIRECTORY/swh-plugins-0.4.15-pic.patch && patch -p1 < $SPELL_DIRECTORY/swh-plugins-nosetlocale.patch && +# Minimal hack to make it work with current autoconf. +# More should be done. Like, ditching bitchin' autoconf. +sed -i 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' configure.in && # ipdate gettext macros autopoint -f && autoreconf -f -i diff --git a/audio-soft/sox/HISTORY b/audio-soft/sox/HISTORY index f1d00c151e..c56965fc43 100644 --- a/audio-soft/sox/HISTORY +++ b/audio-soft/sox/HISTORY @@ -1,3 +1,6 @@ +2014-08-24 Thomas Orgis <sobukus@sourcemage.org> + * PRE_BUILD: add a define missing from current ffmpeg + 2013-02-17 Robin Cook <rcook@wyrms.net> * DETAILS: updated VERSION to 14.4.1 diff --git a/audio-soft/sox/PRE_BUILD b/audio-soft/sox/PRE_BUILD index bc5bec1b38..6784daec71 100755 --- a/audio-soft/sox/PRE_BUILD +++ b/audio-soft/sox/PRE_BUILD @@ -8,3 +8,8 @@ patch -p0 < "$SPELL_DIRECTORY/file-5.0.patch" && if spell_ok ffmpeg && is_version_less 0.10 $(installed_version ffmpeg); then patch -p1 < "${SPELL_DIRECTORY}/ffmpeg-0.11-arch.patch" fi +# New ffmpeg misses that define for some reason. +echo "#ifndef AVCODEC_MAX_AUDIO_FRAME_SIZE +#define AVCODEC_MAX_AUDIO_FRAME_SIZE 192000 +#endif" >> src/ffmpeg.h + diff --git a/crypto/gnutls/DETAILS b/crypto/gnutls/DETAILS index 439d74fde4..86acf009d8 100755 --- a/crypto/gnutls/DETAILS +++ b/crypto/gnutls/DETAILS @@ -1,11 +1,11 @@ SPELL=gnutls case $GNUTLS_BRANCH in stable) - VERSION=3.2.16 + VERSION=3.2.17 SOURCE=$SPELL-$VERSION.tar.xz ;; stable-old) - VERSION=3.1.25 + VERSION=3.1.26 SOURCE=$SPELL-$VERSION.tar.xz ;; esac diff --git a/crypto/gnutls/HISTORY b/crypto/gnutls/HISTORY index 7823c4e1fb..efe27f20d7 100644 --- a/crypto/gnutls/HISTORY +++ b/crypto/gnutls/HISTORY @@ -1,3 +1,6 @@ +2014-08-25 Ladislav Hagara <hgr@vabo.cz> + * DETAILS: 3.2.17 and 3.1.26 + 2014-07-24 Treeve Jelbert <treeve@sourcemage.org> * DETAILS: 3.2.16 * DEPENDS: add gettext, remove lzo diff --git a/crypto/nss/HISTORY b/crypto/nss/HISTORY index 3c0c1107d2..dd56ffd180 100644 --- a/crypto/nss/HISTORY +++ b/crypto/nss/HISTORY @@ -1,3 +1,9 @@ +2014-08-24 Thomas Orgis <sobukus@sourcemage.org> + * PRE_BUILD: fixup of default branch with PEM + * nss-pem-20140808.tar.bz2: new PEM from + https://git.fedorahosted.org/git/nss-pem.git + * INSTALL: fix path for nss-config in 3.15.5 + 2014-07-22 Treeve Jelbert <treeve@sourcemage.org> * PRE_BUILD: fix 3.16 aptching diff --git a/crypto/nss/INSTALL b/crypto/nss/INSTALL index 0e7491d67b..f216bde9af 100755 --- a/crypto/nss/INSTALL +++ b/crypto/nss/INSTALL @@ -31,7 +31,7 @@ install -v -m755 */bin/* $INSTALL_ROOT/usr/bin && if [[ $NSS_BRANCH == "3.16" ]]; then install -v -m755 ../nss/config/nss-config $INSTALL_ROOT/usr/bin elif [[ $NSS_BRANCH == "3.15" ]]; then - install -v -m755 ../security/nss/cmd/disttools/nss-config $INSTALL_ROOT/usr/bin + install -v -m755 ../nss/config/nss-config $INSTALL_ROOT/usr/bin fi && install -v -d -m755 $INSTALL_ROOT/usr/include/nss && diff --git a/crypto/nss/PRE_BUILD b/crypto/nss/PRE_BUILD index 543ad0e763..127e97859a 100755 --- a/crypto/nss/PRE_BUILD +++ b/crypto/nss/PRE_BUILD @@ -12,9 +12,16 @@ else patch -p1 < $SCRIPT_DIRECTORY/nss-3.12-config-1.patch fi && -if [[ "$NSS_PEM" == "y" && $NSS_BRANCH == "3.14" ]]; then - tar jxvf $SCRIPT_DIRECTORY/nss-pem-20100412.tar.bz2 && - patch -p0 < $SCRIPT_DIRECTORY/nss-enable-pem.patch && +if [[ "$NSS_PEM" == "y" ]]; then + # New or old source trees are easy to tell apart. + if test -e nss; then + tar jxvf $SCRIPT_DIRECTORY/nss-pem-20140808.tar.bz2 && + patch -p3 < $SCRIPT_DIRECTORY/nss-enable-pem.patch + else + # Playing safe with old stuff, no new PEM source there. + tar jxvf $SCRIPT_DIRECTORY/nss-pem-20100412.tar.bz2 && + patch -p0 < $SCRIPT_DIRECTORY/nss-enable-pem.patch + fi && if [[ $NSS_BRANCH == "3.14" ]]; then patch -p1 < $SPELL_DIRECTORY/nss-3.14.3_sync_with_upstream_softokn_changes.patch fi diff --git a/crypto/nss/nss-pem-20140808.tar.bz2 b/crypto/nss/nss-pem-20140808.tar.bz2 Binary files differnew file mode 100644 index 0000000000..8c23ceb5a3 --- /dev/null +++ b/crypto/nss/nss-pem-20140808.tar.bz2 diff --git a/disk/cdrtools/DETAILS b/disk/cdrtools/DETAILS index 1c3c32ddb0..27ee7c3840 100755 --- a/disk/cdrtools/DETAILS +++ b/disk/cdrtools/DETAILS @@ -1,10 +1,10 @@ SPELL=cdrtools - VERSION=3.01a23 + VERSION=3.01a24 ALPHA=$([ "${VERSION//a/}" != "$VERSION" ] && echo 1) SOURCE=${SPELL}-${VERSION}.tar.gz SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION%a*} - SOURCE_URL[0]=ftp://ftp.berlios.de/pub/cdrecord/${ALPHA:+alpha/}${SOURCE} - SOURCE_HASH=sha512:1be49bf26947aaf6b9b962b71311b044de97b2a0c0ca2133ef39c43908a9758f39d954447db553f581b2403d7df7328b63e79e8c5a632df5102920c7d37ab67e + SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/${ALPHA:+alpha/}${SOURCE} + SOURCE_HASH=sha512:81a94cddac63ce1d160928b292cfe03806f47cbc6e6278bc819eb8f2019b7fdb4d2036b30e230e32e4c3f51711d0d2eea68b97e75b6b3bbbb3f1a93e891c28ef LICENSE[0]=GPL KEYWORDS="disk" WEB_SITE=http://cdrecord.berlios.de/private/cdrecord.html diff --git a/disk/cdrtools/HISTORY b/disk/cdrtools/HISTORY index ff9d084698..f7c830ea73 100644 --- a/disk/cdrtools/HISTORY +++ b/disk/cdrtools/HISTORY @@ -1,3 +1,7 @@ +2014-08-24 Thomas Orgis <sobukus@sourcemage.org> + * DETAILS: updated spell to 3.01a24, switch URL to Sourceforge + * PRE_BUILD: fix man path + 2014-05-08 Ismael Luceno <ismael@sourcemage.org> * DETAILS: updated spell to 3.01a23 diff --git a/disk/cdrtools/PRE_BUILD b/disk/cdrtools/PRE_BUILD index 85565c8ce6..7562753ec0 100755 --- a/disk/cdrtools/PRE_BUILD +++ b/disk/cdrtools/PRE_BUILD @@ -3,4 +3,4 @@ cd ${SOURCE_DIRECTORY} && sedit "s:/usr/src/linux/include::i" DEFAULTS/Defaults.linux && sedit "s:/opt/schily:/usr:gi" DEFAULTS/Defaults.linux && sedit "s:/usr/src/linux/include::gi" DEFAULTS/Defaults.linux && -sedit "1iMANDIR= share/man" RULES/rules.man +sedit "1iMANDIR= man" RULES/rules.man diff --git a/disk/lvm/DETAILS b/disk/lvm/DETAILS index 24d5f19e58..796574c311 100755 --- a/disk/lvm/DETAILS +++ b/disk/lvm/DETAILS @@ -1,5 +1,5 @@ SPELL=lvm - VERSION=2.02.100 + VERSION=2.02.109 SOURCE=LVM2.$VERSION.tgz SOURCE2=$SOURCE.asc SOURCE_DIRECTORY=$BUILD_DIRECTORY/LVM2.$VERSION diff --git a/disk/lvm/HISTORY b/disk/lvm/HISTORY index a36332bd7a..d68974e5ec 100644 --- a/disk/lvm/HISTORY +++ b/disk/lvm/HISTORY @@ -1,3 +1,8 @@ +2014-08-24 Thomas Orgis <sobukus@sourcemage.org> + * DETAILS: 2.02.109 + * lvm-static-hotfix.patch, PRE_BUILD: dirty hack to link missing libs + to static build (was needed on a fresh install, not sure why broken now) + 2013-08-18 Ladislav Hagara <hgr@vabo.cz> * DETAILS: 2.02.100 diff --git a/disk/lvm/PRE_BUILD b/disk/lvm/PRE_BUILD new file mode 100755 index 0000000000..92c0ce3924 --- /dev/null +++ b/disk/lvm/PRE_BUILD @@ -0,0 +1,3 @@ +default_pre_build && +cd "$SOURCE_DIRECTORY" && +patch -p1 < "$SCRIPT_DIRECTORY/lvm-static-hotfix.patch" diff --git a/disk/lvm/lvm-static-hotfix.patch b/disk/lvm/lvm-static-hotfix.patch new file mode 100644 index 0000000000..e586dbb648 --- /dev/null +++ b/disk/lvm/lvm-static-hotfix.patch @@ -0,0 +1,21 @@ +diff -ru LVM2.2.02.109.orig/tools/Makefile.in LVM2.2.02.109/tools/Makefile.in +--- LVM2.2.02.109.orig/tools/Makefile.in 2014-08-05 03:10:57.000000000 +0200 ++++ LVM2.2.02.109/tools/Makefile.in 2014-08-08 08:45:14.849098142 +0200 +@@ -128,7 +128,7 @@ + + dmsetup.static: dmsetup.o $(interfacebuilddir)/libdevmapper.a + $(CC) $(CFLAGS) $(LDFLAGS) -static -L$(interfacebuilddir) \ +- -o $@ dmsetup.o -ldevmapper $(STATIC_LIBS) $(LIBS) ++ -o $@ dmsetup.o -ldevmapper $(STATIC_LIBS) $(LIBS) -lpthread + + all: device-mapper + +@@ -144,7 +144,7 @@ + + lvm.static: $(OBJECTS) lvm-static.o $(top_builddir)/lib/liblvm-internal.a $(interfacebuilddir)/libdevmapper.a + $(CC) $(CFLAGS) $(LDFLAGS) -static -L$(interfacebuilddir) -o $@ \ +- $(OBJECTS) lvm-static.o $(LVMLIBS) $(STATIC_LIBS) $(LIBS) ++ $(OBJECTS) lvm-static.o $(LVMLIBS) $(STATIC_LIBS) $(LIBS) -luuid -lpthread + + liblvm2cmd.a: $(top_builddir)/lib/liblvm-internal.a $(OBJECTS) lvmcmdlib.o lvm2cmd.o + cat $(top_builddir)/lib/liblvm-internal.a > $@ diff --git a/disk/xcdroast/DETAILS b/disk/xcdroast/DETAILS index b2572a7052..1fe2ef473f 100755 --- a/disk/xcdroast/DETAILS +++ b/disk/xcdroast/DETAILS @@ -1,9 +1,9 @@ SPELL=xcdroast - VERSION=0.98alpha15 + VERSION=0.98alpha16 SOURCE=${SPELL}-${VERSION}.tar.gz SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION} SOURCE_URL[0]=${SOURCEFORGE_URL}/${SPELL}/${SOURCE} - SOURCE_HASH=sha512:ad9b9d679c5c220c424b04e90113609e5023d730b99fe3ab0007bf05d35dd610edf14da664f37e1def5801e0702a03da2f5b002df0cb9c4f5f5c398c6c8b23a4 + SOURCE_HASH=sha512:dec789955eb70a14f6bcb7c0895a6ca4b7c471cc5ee7ab12af1e671c8586c481c4a05e20eb42724d686d561a551809d9437dafadd3cd081079cefc28e0b94df7 WEB_SITE=http://www.xcdroast.org/ LICENSE[0]=GPL ENTERED=20020210 diff --git a/disk/xcdroast/HISTORY b/disk/xcdroast/HISTORY index aea93aa54f..278f7a9748 100644 --- a/disk/xcdroast/HISTORY +++ b/disk/xcdroast/HISTORY @@ -1,3 +1,9 @@ +2014-08-24 Thomas Orgis <sobukus@sourcemage.org> + * DETAILS: version 0.98alpha16 + * PRE_BUILD, io_progressbar_fix.patch, cdd2wav_version.patch: upstream + patches + * modern_cdrtools.patch: removed + 2012-01-24 Ismael Luceno <ismael.luceno@gmail.com> * DEPENDS: depend on CD-BURN-UTILITY instead of cdrtools. diff --git a/disk/xcdroast/PRE_BUILD b/disk/xcdroast/PRE_BUILD index bd15df746a..4e56430efc 100755 --- a/disk/xcdroast/PRE_BUILD +++ b/disk/xcdroast/PRE_BUILD @@ -2,5 +2,10 @@ default_pre_build && if [ $XCDROAST_GTK2 == "y" ]; then tar xzf $SCRIPT_DIRECTORY/new_configure.tar.gz -C $SOURCE_DIRECTORY && OPTS="$OPTS --enable-gtk2" -fi && -patch -d $SOURCE_DIRECTORY -p1 < $SPELL_DIRECTORY/modern_cdrtools.patch +fi +cd "$SOURCE_DIRECTORY" && +# Upstream patches. http://www.xcdroast.org/xcdr098/patches/ +echo cdda2wav_version.patch && +patch -p1 < "$SCRIPT_DIRECTORY/cdda2wav_version.patch" && +echo io_progressbar_fix.patch && +patch -p0 < "$SCRIPT_DIRECTORY/io_progressbar_fix.patch" diff --git a/disk/xcdroast/cdda2wav_version.patch b/disk/xcdroast/cdda2wav_version.patch new file mode 100644 index 0000000000..cd001e0ee7 --- /dev/null +++ b/disk/xcdroast/cdda2wav_version.patch @@ -0,0 +1,54 @@ +diff -urNad xcdroast-0.98+0alpha16~/src/io.c xcdroast-0.98+0alpha16/src/io.c +--- xcdroast-0.98+0alpha16~/src/io.c 2008-08-21 15:11:40.000000000 +0200 ++++ xcdroast-0.98+0alpha16/src/io.c 2009-12-29 22:54:08.571188849 +0100 +@@ -10062,6 +10062,7 @@ + + gint check_version_cdda2wav(gchar *match, gchar *found) { + gchar line[MAXLINE]; ++gchar vline[MAXLINE]; + gchar ver[MAXLINE]; + FILE *fpin; + gchar *p; +@@ -10076,32 +10077,38 @@ + } + + strcpy(line,""); ++ strcpy(vline,""); + for (;;) { + if (fgets(line,MAXLINE,fpin) == NULL) + break; + dodebug(10,"got: %s",line); ++ ++ /* only get first line */ ++ if (strcmp(vline,"") == 0) { ++ strncpy(vline, line, MAXLINE); ++ } + } + + if (pclose(fpin) == -1) { + g_error("pclose error\n"); + } + +- if (strcmp(line,"") == 0 || strstr(line,"sh:") != NULL) { ++ if (strcmp(vline,"") == 0 || strstr(vline,"sh:") != NULL) { + /* failed to open - permission denied */ + return 2; + } + +- /* now line contains the version string of cdda2wav */ ++ /* now vline contains the version string of cdda2wav */ + /* try to extract the version number */ + +- p = strstr(line,"version"); ++ p = strstr(vline,"version"); + if (p != NULL) { + p = strtok(p+8, " _"); + if (p != NULL) { + strcpy(ver,p); + } + } else { +- p = strstr(line,"cdda2wav"); ++ p = strstr(vline,"cdda2wav"); + if (p != NULL) { + p = strtok(p+9, " "); + if (p != NULL) { diff --git a/disk/xcdroast/io_progressbar_fix.patch b/disk/xcdroast/io_progressbar_fix.patch new file mode 100644 index 0000000000..5632c1ff87 --- /dev/null +++ b/disk/xcdroast/io_progressbar_fix.patch @@ -0,0 +1,39 @@ +--- src/io.c.last So. Jan 24 19:18:45 2010 ++++ src/io.c Fr. Jul 16 10:59:32 2010 +@@ -3202,6 +3202,8 @@ + close(fd2[1]); + } + ++ g_setenv("LC_ALL", "C", TRUE); ++ + /* startup child */ + if (execl("/bin/sh", "sh", "-c", cmd ,(void *)NULL) < 0) { + g_error("execl error\n"); +@@ -3402,6 +3404,8 @@ + close(fd3[1]); + } + ++ g_setenv("LC_ALL", "C", TRUE); ++ + /* startup child */ + if (execv(callpath,arglist) < 0) { + g_error("execv error\n"); +@@ -3506,6 +3510,8 @@ + close(pipefd[1]); + } + ++ g_setenv("LC_ALL", "C", TRUE); ++ + /* startup first child */ + if (execv(callpath,arglist) < 0) { + g_error("execv error\n"); +@@ -3568,6 +3574,8 @@ + close(fd3[1]); + } + ++ g_setenv("LC_ALL", "C", TRUE); ++ + /* startup second child */ + if (execv(callpath2,arglist2) < 0) { + g_error("execv error\n"); + diff --git a/disk/xcdroast/modern_cdrtools.patch b/disk/xcdroast/modern_cdrtools.patch deleted file mode 100644 index 3aba1e8268..0000000000 --- a/disk/xcdroast/modern_cdrtools.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- xcdroast-0.98alpha15/src/io.c 2003-10-26 15:24:48.000000000 +0100 -+++ xcdroast-0.98alpha15-P/src/io.c 2006-09-25 20:07:33.000000000 +0200 -@@ -9026,7 +9026,7 @@ - strcat(tmp2,"-D "); - } - if (masterparam.opt[7]) { -- strcat(tmp2,"-L "); -+ strcat(tmp2,"-allow-leading-dots "); - } - if (masterparam.opt[8]) { - strcat(tmp2,"-d "); -@@ -9160,7 +9160,7 @@ - } - if (masterparam.publisher) { - strcpy(tmptmp, masterparam.publisher); -- g_snprintf(tmp5,MAXLINE,"-P \"%s\" ", -+ g_snprintf(tmp5,MAXLINE,"-publisher \"%s\" ", - convert_escape(tmptmp)); - strcat(tmp4,tmp5); - } - diff --git a/doc/evince/DEPENDS b/doc/evince/DEPENDS index 721a339ed3..737aa1e6d9 100755 --- a/doc/evince/DEPENDS +++ b/doc/evince/DEPENDS @@ -8,6 +8,7 @@ depends gtk+3 && depends gconf2 && depends shared-mime-info && depends gnome-icon-theme && +depends gnome-icon-theme-symbolic && depends xml-parser-expat && depends itstool && depends libsecret && diff --git a/doc/evince/HISTORY b/doc/evince/HISTORY index 68c898b7a5..da9742dbf6 100644 --- a/doc/evince/HISTORY +++ b/doc/evince/HISTORY @@ -1,3 +1,6 @@ +2014-04-18 Thomas Orgis <sobukus@sourcemage.org> + * DEPENDS: need symbolic icons + 2013-07-11 Ladislav Hagara <hgr@vabo.cz> * DETAILS: 3.8.3 diff --git a/doc/mupdf/BUILD b/doc/mupdf/BUILD index 886140f85d..447d986060 100755 --- a/doc/mupdf/BUILD +++ b/doc/mupdf/BUILD @@ -1 +1 @@ -make build=release verbose=1 +CFLAGS= LIBS= make XCFLAGS="$CFLAGS" XLIBS="$LDFLAGS" build=release verbose=1 diff --git a/doc/mupdf/DETAILS b/doc/mupdf/DETAILS index 8c478a174c..19bf44feb7 100755 --- a/doc/mupdf/DETAILS +++ b/doc/mupdf/DETAILS @@ -1,9 +1,9 @@ SPELL=mupdf - VERSION=1.2 - SOURCE_HASH=sha512:49261c5356d4e5648f89bfb783a23a3c3a470e044fe3b234f0906b0f6b71efad557981682e41ce3d754a5a31f1e5518e5e5f5f8dc83d2ca53181dbd3f4726e02 - SOURCE=$SPELL-$VERSION-source.zip + VERSION=1.4 + SOURCE_HASH=sha512:6ed37df85760f08a8c967c824c08fcaa79bc2bfc4f1787d50cb59b8c11f1be41d7163e0e5d0bede93b066ff2ef9fcfaf748555ea7b4a02ddabb6a0b175f403fe + SOURCE=$SPELL-$VERSION-source.tar.gz SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION-source" - SOURCE_URL[0]=http://mupdf.googlecode.com/files/$SOURCE + SOURCE_URL[0]=http://mupdf.com/downloads/$SOURCE WEB_SITE=http://www.mupdf.com/ ENTERED=20120426 LICENSE[0]=GPL diff --git a/doc/mupdf/HISTORY b/doc/mupdf/HISTORY index 893cd7f8f9..50d61ca678 100644 --- a/doc/mupdf/HISTORY +++ b/doc/mupdf/HISTORY @@ -1,3 +1,7 @@ +2014-04-18 Thomas Orgis <sobukus@sourcemage.org> + * DETAILS: updated spell to 1.4; changed source extension to tar.gz;-) + * BUILD: insert compiler flags as desired by Makefile + 2013-03-09 Vlad Glagolev <stealth@sourcemage.org> * DETAILS: updated spell to 1.2; changed source extension to zip diff --git a/e-17/ecore/DETAILS b/e-17/ecore/DETAILS index 391bf72621..97af11a171 100755 --- a/e-17/ecore/DETAILS +++ b/e-17/ecore/DETAILS @@ -1,10 +1,10 @@ SPELL=ecore - VERSION=1.7.8 + VERSION=1.7.10 SOURCE=$SPELL-$VERSION.tar.bz2 - SOURCE_GPG="gurus.gpg:$SOURCE.sig:WORKS_FOR_ME" +# SOURCE_GPG="gurus.gpg:$SOURCE.sig:WORKS_FOR_ME" SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION SOURCE_URL[0]=http://download.enlightenment.org/releases/$SOURCE -# SOURCE_HASH=sha512:e4739f43abbbce8e78ad739fab9cedb1a6bcf1684958a17b5490f3b7fe00ae90177d26365d43d10708d3a31bfb255991f7be72442f8101840f8cbac8de842cb5 + SOURCE_HASH=sha512:24fbe064913c566f885a2e51185b1f1d37c62c0d03ba0d549e9715ba516fb6b3f630ad331f89f66e91de1401b06b01b16916650448dda11d5e1efa24e52eaf39 LICENSE[0]=BSD WEB_SITE=http://enlightenment.org/Libraries/Ecore/ ENTERED=20011101 diff --git a/e-17/ecore/HISTORY b/e-17/ecore/HISTORY index 2144f09f1d..4235ed07dc 100644 --- a/e-17/ecore/HISTORY +++ b/e-17/ecore/HISTORY @@ -1,7 +1,9 @@ -2014-08-19 Treeve Jelbert <treeve@sourcemage.org> - * DEPENDS: openssl => SSL +2014-08-24 Thomas Orgis <sobukus@sourcemage.org> + * DETAILS: Updated to 1.7.10 (removed guru sig) - * SUB_DEPENDS, PRE_SUB_DEPENDS: openssl => SSL +2014-08-19 Treeve Jelbert <treeve@sourcemage.org> + * DEPENDS: openssl => SSL + * SUB_DEPENDS, PRE_SUB_DEPENDS: openssl => SSL 2013-07-30 Eric Sandall <sandalle@sourcemage.org> * DETAILS: Updated to 1.7.8 diff --git a/e-17/ecore/ecore-1.7.8.tar.bz2.sig b/e-17/ecore/ecore-1.7.8.tar.bz2.sig Binary files differdeleted file mode 100644 index 34f05812ed..0000000000 --- a/e-17/ecore/ecore-1.7.8.tar.bz2.sig +++ /dev/null diff --git a/e-17/eina/DETAILS b/e-17/eina/DETAILS index ada4cf1a0e..6942279c2c 100755 --- a/e-17/eina/DETAILS +++ b/e-17/eina/DETAILS @@ -1,10 +1,10 @@ SPELL=eina - VERSION=1.7.8 + VERSION=1.7.10 SOURCE=$SPELL-$VERSION.tar.bz2 - SOURCE_GPG="gurus.gpg:$SOURCE.sig:WORKS_FOR_ME" +# SOURCE_GPG="gurus.gpg:$SOURCE.sig:WORKS_FOR_ME" SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION SOURCE_URL[0]=http://download.enlightenment.org/releases/$SOURCE -# SOURCE_HASH=sha512:eaf690cc11a38b19b4ee04475907143c5ac8d9c1c0ba34b8c20d3be535f67dc699edd99d36b4db8e2de5ac9acf6df1f7eace2b8925ce4367d3fecbecef319a53 + SOURCE_HASH=sha512:c1195ec9f2cd79777912ba3c8b6e69a206d035c9a7f2c38762c18e3c86ec43d52f020e4dd8d0ea0c9b580aff9707cede909412260ac6d23796ddbd78eb8e280e LICENSE[0]=LGPL WEB_SITE=http://trac.enlightenment.org/e/wiki/Eina ENTERED=20081013 diff --git a/e-17/eina/HISTORY b/e-17/eina/HISTORY index c141be68db..19ca3ab505 100644 --- a/e-17/eina/HISTORY +++ b/e-17/eina/HISTORY @@ -1,3 +1,6 @@ +2014-08-24 Thomas Orgis <sobukus@sourcemage.org> + * DETAILS: Updated to 1.7.10 (removed guru sig) + 2013-07-30 Eric Sandall <sandalle@sourcemage.org> * DETAILS: Updated to 1.7.8 diff --git a/e-17/eina/eina-1.7.8.tar.bz2.sig b/e-17/eina/eina-1.7.8.tar.bz2.sig Binary files differdeleted file mode 100644 index 97dfed69ed..0000000000 --- a/e-17/eina/eina-1.7.8.tar.bz2.sig +++ /dev/null diff --git a/editors/gawk/BUILD b/editors/gawk/BUILD index faf4b9655c..6e4e95a0d9 100755 --- a/editors/gawk/BUILD +++ b/editors/gawk/BUILD @@ -1,10 +1,14 @@ [[ $CROSS_INSTALL == on ]] && OPTS="$OPTS --host=${HOST}" - +# Disable mpfr and readline as that complicates upgrade +# of gmp ... which fails mid-way since sorcery really relies +# on awk to work. Proper fix would be to protect all +# base libraries during dispel, like libc. -- ThOr ./configure --build=${BUILD} \ --prefix=${TRACK_ROOT}/usr \ --bindir=${TRACK_ROOT}/bin \ --infodir=${TRACK_ROOT}/usr/share/info \ --mandir=${TRACK_ROOT}/usr/share/man \ + --without-mpfr --without-readline \ ${OPTS} && make DESTDIR=$INSTALL_ROOT diff --git a/editors/gawk/HISTORY b/editors/gawk/HISTORY index e8ad2a0136..2cd60a1622 100644 --- a/editors/gawk/HISTORY +++ b/editors/gawk/HISTORY @@ -1,3 +1,8 @@ +2014-08-24 Thomas Orgis <sobukus@sourcemage.org> + * BUILD: reduce usage of libraries to prevent failure of spell + upgrades (example: awk broken when updating gmp, sorcery cannot complete + when awk cannot run due to temporarily missing libgmp) + 2014-04-13 Treeve Jelbert <treeve@sourcemage.org> * DETAILS: version 4.1.1 diff --git a/graphics-libs/freeglut/DEPENDS b/graphics-libs/freeglut/DEPENDS index d3212c0640..3bb197126e 100755 --- a/graphics-libs/freeglut/DEPENDS +++ b/graphics-libs/freeglut/DEPENDS @@ -1,4 +1,8 @@ depends OPENGL && +if test mesalib-1x = "$(get_spell_provider $SPELL OPENGL)"; then + # New mesalib has it separated out. + depends glu +fi && depends libx11 && depends libxi && depends libxext && diff --git a/graphics-libs/freeglut/HISTORY b/graphics-libs/freeglut/HISTORY index e3d4546616..5ffe91c578 100644 --- a/graphics-libs/freeglut/HISTORY +++ b/graphics-libs/freeglut/HISTORY @@ -1,3 +1,6 @@ +2014-08-24 Thomas Orgis <sobukus@sourcemage.org> + * DEPENDS: separate glu for mesalib-1x + 2014-05-29 Treeve Jelbert <treeve@sourcemage.org> * DEPENDS: major cleanup diff --git a/libs/libconfig/DEPENDS b/libs/libconfig/DEPENDS new file mode 100755 index 0000000000..cf20e51fc3 --- /dev/null +++ b/libs/libconfig/DEPENDS @@ -0,0 +1,2 @@ +depends -sub CXX gcc + diff --git a/libs/libconfig/HISTORY b/libs/libconfig/HISTORY index a2d4b8c263..c74b1b452c 100644 --- a/libs/libconfig/HISTORY +++ b/libs/libconfig/HISTORY @@ -1,3 +1,6 @@ +2014-08-24 Thomas Orgis <sobukus@sourcemage.org> + * DEPENDS: C++ + 2013-02-14 Ismael Luceno <ismael@sourcemage.org> * DETAILS: updated spell to 1.4.9 diff --git a/libs/libdrm/HISTORY b/libs/libdrm/HISTORY index b3a60ef83c..4a2a420a57 100644 --- a/libs/libdrm/HISTORY +++ b/libs/libdrm/HISTORY @@ -1,3 +1,7 @@ +2014-08-24 Thomas Orgis <sobukus@sourcemage.org> + * SUB_DEPENDS, PRE_SUB_DEPENDS: support NV and NOUVEAU, both in field + use:-/ + 2014-07-30 Treeve Jelbert <treeve@sourcemage.org> * DETAILS: 2.4.56 diff --git a/libs/libdrm/PRE_SUB_DEPENDS b/libs/libdrm/PRE_SUB_DEPENDS index b8aa1941a1..10c89b65b8 100755 --- a/libs/libdrm/PRE_SUB_DEPENDS +++ b/libs/libdrm/PRE_SUB_DEPENDS @@ -1,5 +1,5 @@ case $THIS_SUB_DEPENDS in - NV) [[ "$LIBDRM_NV" == "y" ]] && return 0 ;; + NV|NOUVEAU) [[ "$LIBDRM_NV" == "y" ]] && return 0 ;; INTEL) [[ "$LIBDRM_INTEL" == "y" ]] && return 0 ;; RADEON) [[ "$LIBDRM_RADEON" == "y" ]] && return 0 ;; *) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL $THIS_SUB_DEPENDS${DEFAULT_COLOR}" diff --git a/libs/libdrm/SUB_DEPENDS b/libs/libdrm/SUB_DEPENDS index f0d0d9e60b..5db50df596 100755 --- a/libs/libdrm/SUB_DEPENDS +++ b/libs/libdrm/SUB_DEPENDS @@ -1,5 +1,5 @@ case $THIS_SUB_DEPENDS in - NV) message "${SPELL_COLOR}libdrm${DEFAULT_COLOR}${MESSAGE_COLOR} requested with Nouveau KMS API${DEFAULT_COLOR}" && + NV|NOUVEAU) message "${SPELL_COLOR}libdrm${DEFAULT_COLOR}${MESSAGE_COLOR} requested with Nouveau KMS API${DEFAULT_COLOR}" && LIBDRM_NV='y' ;; INTEL) message "${SPELL_COLOR}libdrm${DEFAULT_COLOR}${MESSAGE_COLOR} requested with Intel KMS API${DEFAULT_COLOR}" && diff --git a/net/net-tools/BUILD b/net/net-tools/BUILD index 1f79ca2d5c..65e023e15e 100755 --- a/net/net-tools/BUILD +++ b/net/net-tools/BUILD @@ -16,4 +16,3 @@ sedit '382,391s/$/\\n\\/' mii-tool.c && ./configure.sh config.in < smgl_config_opts && make_single && make COPTS="-D_GNU_SOURCE -Wall $CFLAGS" LOPTS="$LDFLAGS" - diff --git a/net/net-tools/CONFIGURE b/net/net-tools/CONFIGURE index 5ef105b6db..772bee8168 100755 --- a/net/net-tools/CONFIGURE +++ b/net/net-tools/CONFIGURE @@ -20,8 +20,14 @@ config_query ARCNET "ARCnet hardware support?" y && config_query SLIP "SLIP (serial line) hardware support?" y && config_query PPP "PPP (serial line) hardware support?" y && config_query IPIP "IPIP Tunnel hardware support?" y && -config_query STRIP "STRIP (Metricom radio) hardware support?" y && -config_query TOKEN "Token ring (generic) hardware support?" y && +# Disable STRIP and Token Ring, not supported by kernel anymore, see +# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=700008 . +#config_query STRIP "STRIP (Metricom radio) hardware support?" y && +persistent_add STRIP && +STRIP=n && +#config_query TOKEN "Token ring (generic) hardware support?" y && +persistent_add TOKEN && +TOKEN=n && config_query HWAX25 "AX25 (packet radio) hardware support?" y && config_query HWROSE "Rose (packet radio) hardware support?" y && config_query HWNETROM "NET/ROM (packet radio) hardware support?" y && diff --git a/net/net-tools/HISTORY b/net/net-tools/HISTORY index dc4db4b79c..4e1f3eb374 100644 --- a/net/net-tools/HISTORY +++ b/net/net-tools/HISTORY @@ -1,3 +1,6 @@ +2014-08-24 Thomas Orgis <sobukus@sourcemage.org> + * CONFIGURE, BUILD: disable STRIP and Token Ring lacking kernel support + 2009-09-30 Arjan Bouter <abouter@sourcemage.org> * DEPENDS: use INITSCRIPTS provider diff --git a/net/tcp_wrappers/BUILD b/net/tcp_wrappers/BUILD index 006f4caf23..bc8814d137 100755 --- a/net/tcp_wrappers/BUILD +++ b/net/tcp_wrappers/BUILD @@ -2,5 +2,9 @@ sed -i "/^extern/d" scaffold.c && patch -p 1 < $SCRIPT_DIRECTORY/tcp_wrappers.patch && +if [[ ${SMGL_COMPAT_ARCHS[1]} == "x86_64" ]]; then + # There are folks who want to link libwrap into shared objects. + CFLAGS+=" -DPIC -fPIC" +fi sedit 's/= -O/= '"$CFLAGS"'/' Makefile && make REAL_DAEMON_DIR=${INSTALL_ROOT}/usr/sbin linux diff --git a/net/tcp_wrappers/HISTORY b/net/tcp_wrappers/HISTORY index 34e996d922..5b81b5e6c1 100644 --- a/net/tcp_wrappers/HISTORY +++ b/net/tcp_wrappers/HISTORY @@ -1,3 +1,7 @@ +2014-08-24 Thomas Orgis <sobukus@sourcemage.org> + * BUILD: enforce PIC on x86-64 to enable other spells to include + libwrap.a in dynamic libs, which does happen and fails otherwise + 2006-09-21 Juuso Alasuutari <iuso@sourcemage.org> * DETAILS: [automated] Removed BUILD_API=2. diff --git a/net/wpa_supplicant/BUILD b/net/wpa_supplicant/BUILD index 56f581711b..b2a69098d2 100755 --- a/net/wpa_supplicant/BUILD +++ b/net/wpa_supplicant/BUILD @@ -1,3 +1,4 @@ +CFLAGS="$CFLAGS -I$INSTALL_ROOT/usr/include/libnl3" cd "$SOURCE_DIRECTORY/wpa_supplicant" # Create .config file for make (this is here instead of PRE_BUILD because diff --git a/net/wpa_supplicant/DEPENDS b/net/wpa_supplicant/DEPENDS index b19658a530..597453e923 100755 --- a/net/wpa_supplicant/DEPENDS +++ b/net/wpa_supplicant/DEPENDS @@ -1,12 +1,18 @@ depends wireless_tools && +if [ "$CONFIG_DRIVER_NL80211" = y ]; then + depends libnl +fi && + if [[ $CONFIG_EAP_SIM == y || $CONFIG_EAP_AKA == y ]]; then depends pcsc-lite fi && -if [[ $CONFIG_TLS && $CONFIG_TLS != internal ]]; then - depends $CONFIG_TLS -fi && +case "$CONFIG_TLS" in +internal) ;; +openssl) depends SSL ;; +*) depends $CONFIG_TLS ;; +esac && if [[ $CONFIG_DNET_PCAP == y || $CONFIG_L2_PACKET == pcap ]]; then depends libpcap && diff --git a/net/wpa_supplicant/HISTORY b/net/wpa_supplicant/HISTORY index b8dcc0bd1a..431042c2cb 100644 --- a/net/wpa_supplicant/HISTORY +++ b/net/wpa_supplicant/HISTORY @@ -1,3 +1,7 @@ +2014-08-23 Ismael Luceno <ismael@sourcemage.org> + * DEPENDS: Allow the use of libressl + * BUILD, DEPENDS: nl80211 support requires libnl + 2012-12-31 Vlad Glagolev <stealth@sourcemage.org> * PRE_BUILD, INSTALL: dbus service patching isn't required for 1.1; fixed build diff --git a/shell-term-fm/screen/DETAILS b/shell-term-fm/screen/DETAILS index 4247a4d852..190786e564 100755 --- a/shell-term-fm/screen/DETAILS +++ b/shell-term-fm/screen/DETAILS @@ -1,12 +1,12 @@ SPELL=screen - VERSION=4.0.3 + VERSION=4.2.1 PATCHLEVEL=1 SOURCE=${SPELL}-${VERSION}.tar.gz SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION SOURCE_URL[0]=ftp://ftp.uni-erlangen.de/pub/utilities/${SPELL}/${SOURCE} SOURCE_URL[1]=ftp://ftp.sourcemage.sk/sources/${SOURCE} SOURCE_URL[2]=$GNU_URL/$SPELL/$SOURCE - SOURCE_HASH=sha512:24c1f598972f3dc9ed49cd2c05852190a0190d22fa01401eee8484627c8dd2815f0a422d9b2697faa8aaa0b3efc6730a94e2d5aa787dbe5e9ec719143176c338 + SOURCE_HASH=sha512:30826b2a2fc436483276b90cc4c6679470f7ccb7098c9bb8457d0e534998cd12da02882cf80678465f6540cade170c3fdc6bdfa31b07359ff0d3ffe2d6063710 WEB_SITE=http://www.gnu.org/software/screen ENTERED=20010922 SECURITY_PATCH=1 diff --git a/shell-term-fm/screen/HISTORY b/shell-term-fm/screen/HISTORY index d8efa5d475..c0d1e6ac2e 100644 --- a/shell-term-fm/screen/HISTORY +++ b/shell-term-fm/screen/HISTORY @@ -1,3 +1,7 @@ +2014-08-09 Thomas Orgis <sobukus@sourcemage.org> + * DETAILS: bump to 4.2.1! + (now hopefully supporting TERM=rxvt-unicode-256color) + 2008-08-22 Martin Spitzbarth <m.spitzbarth@gmx.de> * DETAILS: PATCHLEVEL++ * PRE_BUILD: prevented the link against libelf, it's not needed. diff --git a/utils/dbus-c++/DEPENDS b/utils/dbus-c++/DEPENDS index 23a928642e..663c953c5c 100755 --- a/utils/dbus-c++/DEPENDS +++ b/utils/dbus-c++/DEPENDS @@ -1,3 +1,7 @@ +# Sorcery tells me that I please install git ... +# why doesn't it just do it? +# I need to discuss with SMGL folks. +depends git && depends -sub CXX gcc && depends dbus && depends expat && @@ -7,6 +11,8 @@ optional_depends glib2 \ "--disable-glib" \ "Enable glib support?" && +# Not optional anymore, I presume? The configure bails out without. +#depends ecore && optional_depends ecore \ "--enable-ecore" \ "--disable-ecore" \ diff --git a/utils/dbus-c++/HISTORY b/utils/dbus-c++/HISTORY index e003df20e1..e6871040db 100644 --- a/utils/dbus-c++/HISTORY +++ b/utils/dbus-c++/HISTORY @@ -1,3 +1,6 @@ +2014-08-24 Thomas Orgis <sobukus@sourcemage.org> + * unistd.patch, PRE_BUILD: gimme standard headers, proper bootstrap + 2014-07-03 Ismael Luceno <ismael@sourcemage.org> * DETAILS, PREPARE: Use prepare_select_branch and get_scm_version diff --git a/utils/dbus-c++/PRE_BUILD b/utils/dbus-c++/PRE_BUILD index 5a39be9a40..74f912122e 100755 --- a/utils/dbus-c++/PRE_BUILD +++ b/utils/dbus-c++/PRE_BUILD @@ -3,7 +3,8 @@ default_pre_build && cd $SOURCE_DIRECTORY && patch -p1 < $SPELL_DIRECTORY/configure.patch && +patch -p1 < $SPELL_DIRECTORY/unistd.patch && -NOCONFIGURE=Y ./autogen.sh +./bootstrap diff --git a/utils/dbus-c++/unistd.patch b/utils/dbus-c++/unistd.patch new file mode 100644 index 0000000000..23026c0ba6 --- /dev/null +++ b/utils/dbus-c++/unistd.patch @@ -0,0 +1,12 @@ +diff --git a/src/eventloop-integration.cpp b/src/eventloop-integration.cpp +index 0cc65c3..5776971 100644 +--- a/src/eventloop-integration.cpp ++++ b/src/eventloop-integration.cpp +@@ -38,6 +38,7 @@ + #include <cassert> + #include <sys/poll.h> + #include <fcntl.h> ++#include <unistd.h> + + using namespace DBus; + using namespace std; diff --git a/utils/file/DETAILS b/utils/file/DETAILS index 1ff305ea0b..b8e6709422 100755 --- a/utils/file/DETAILS +++ b/utils/file/DETAILS @@ -1,6 +1,6 @@ SPELL=file - VERSION=5.18 - SOURCE_HASH=sha512:eba4dd91053a28494e8a4d436b338ccfa44494dcd6c9031f7bb9c8b372d8cfacf702e0325e34b8498454be21b28dad78f0f63af5ad50b181b1962e0ec779c7b5 + VERSION=5.19 + SOURCE_HASH=sha512:f897454f731b013634f38c02c927d7fb5d0660d5b1a81b7bf614da244558dd64ae44ab35ffc6a5e634a7f670ee287c0e87c70e44266c3123e0d1b73fa303c6ed SOURCE=$SPELL-$VERSION.tar.gz SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION" SOURCE_URL[0]=ftp://ftp.astron.com/pub/file/$SOURCE diff --git a/utils/file/HISTORY b/utils/file/HISTORY index 41d754f2e5..c8a3296606 100644 --- a/utils/file/HISTORY +++ b/utils/file/HISTORY @@ -1,3 +1,6 @@ +2014-08-26 Treeve Jelbert <treeve@sourcemage.org> + * DETAILS: version 5.19 + 2014-03-12 Treeve Jelbert <treeve@sourcemage.org> * DETAILS: version 5.18 diff --git a/video-libs/libiec61883/DETAILS b/video-libs/libiec61883/DETAILS index 0efd838b63..16c7f324e3 100755 --- a/video-libs/libiec61883/DETAILS +++ b/video-libs/libiec61883/DETAILS @@ -1,6 +1,6 @@ SPELL=libiec61883 VERSION=1.2.0 - SOURCE_HASH=sha512:7dc8a186635cba112769e36bf812221aa535641ffe5534c3b05b882fd20eab3a41cfde2fb6466490a7548e8bb45d91792f48f3190dfed671c1945281368c3762 + SOURCE_HASH=sha512:303391dc5d75298039f51bcb9c53061f5ada92210c81dfe860994c05e8e03d6d9d1a662fad780d5766c17a8aade665d996ab3454fc93bc06981a3832e6de4066 SOURCE=$SPELL-$VERSION.tar.gz SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION LICENSE[0]=LGPL diff --git a/video-libs/libiec61883/HISTORY b/video-libs/libiec61883/HISTORY index 26302c4e2b..1e85e7fc71 100644 --- a/video-libs/libiec61883/HISTORY +++ b/video-libs/libiec61883/HISTORY @@ -1,3 +1,6 @@ +2014-08-24 Thomas Orgis <sobukus@sourcemage.org> + * DETAILS: hash sum changed, no old source to compare:-/ + 2009-12-15 Bor Kraljič <pyrobor@ver.si> * DETAILS: fixed to working SOURCE_URL[0] diff --git a/x11-libs/cairo/HISTORY b/x11-libs/cairo/HISTORY index 1f5cbf97d6..895ceb61da 100644 --- a/x11-libs/cairo/HISTORY +++ b/x11-libs/cairo/HISTORY @@ -1,3 +1,6 @@ +2014-08-24 Thomas Orgis <sobukus@sourcemage.org> + * PRE_BUILD, cairo-broken-lto-build.patch: a build fix, bad relocation + 2014-07-04 Pol Vinogradov <vin.public@gmail.com> * DETAILS, PRE_BUILD, PREPARE, PRE_BUILD, PRE_SUB_DEPENDS, REPAIR^all^PRE_SUB_DEPENDS, SUB_DEPENDS: added scm branch diff --git a/x11-libs/cairo/PRE_BUILD b/x11-libs/cairo/PRE_BUILD index e94bf95c23..d77360e4f4 100755 --- a/x11-libs/cairo/PRE_BUILD +++ b/x11-libs/cairo/PRE_BUILD @@ -5,5 +5,7 @@ if [[ "$CAIRO_BRANCH" == "scm" ]]; then NOCONFIGURE=1 ./autogen.sh else # http://bugs.gentoo.org/show_bug.cgi?id=336696 - patch -p1 -d $SOURCE_DIRECTORY < $SPELL_DIRECTORY/cairo-1.10.0-buggy_gradients.patch + patch -p1 -d "$SOURCE_DIRECTORY" < "$SPELL_DIRECTORY/cairo-1.10.0-buggy_gradients.patch" && + # http://sourceforge.net/p/mingw-w64/bugs/396/ + patch -p1 < "$SPELL_DIRECTORY/cairo-broken-lto-build.patch" fi diff --git a/x11-libs/cairo/cairo-broken-lto-build.patch b/x11-libs/cairo/cairo-broken-lto-build.patch new file mode 100644 index 0000000000..8cb0f50b85 --- /dev/null +++ b/x11-libs/cairo/cairo-broken-lto-build.patch @@ -0,0 +1,26 @@ +diff -ru cairo-1.12.16.orig/build/configure.ac.warnings cairo-1.12.16/build/configure.ac.warnings +--- cairo-1.12.16.orig/build/configure.ac.warnings 2013-08-26 17:07:21.000000000 +0200 ++++ cairo-1.12.16/build/configure.ac.warnings 2014-08-08 08:13:14.566163013 +0200 +@@ -39,7 +39,7 @@ + dnl -flto working really needs a test link, not just a compile + + safe_MAYBE_WARN="$MAYBE_WARN" +-MAYBE_WARN="$MAYBE_WARN -flto" ++MAYBE_WARN="$MAYBE_WARN -flto -ffat-lto-objects -fuse-linker-plugin" + AC_TRY_LINK([],[ + int main(int argc, char **argv) { return 0; } + ],[],[ +Only in cairo-1.12.16/build: configure.ac.warnings.orig +diff -ru cairo-1.12.16.orig/configure cairo-1.12.16/configure +--- cairo-1.12.16.orig/configure 2013-08-26 19:00:41.000000000 +0200 ++++ cairo-1.12.16/configure 2014-08-08 08:15:19.576158790 +0200 +@@ -18147,7 +18147,7 @@ + + + safe_MAYBE_WARN="$MAYBE_WARN" +-MAYBE_WARN="$MAYBE_WARN -flto" ++MAYBE_WARN="$MAYBE_WARN -flto -ffat-lto-objects -fuse-linker-plugin" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + +Only in cairo-1.12.16: configure.orig diff --git a/x11-toolkits/wxgtk/DEPENDS b/x11-toolkits/wxgtk/DEPENDS index bf985f708b..36a6323402 100755 --- a/x11-toolkits/wxgtk/DEPENDS +++ b/x11-toolkits/wxgtk/DEPENDS @@ -22,6 +22,10 @@ optional_depends MESALIB \ '--with-opengl' \ '--without-opengl' \ 'for OpenGL support' && +if is_depends_enabled $SPELL mesalib-1x; then + # New mesalib has it separated out. + depends glu +fi && optional_depends expat \ '--with-expat' \ '--without-expat' \ diff --git a/x11-toolkits/wxgtk/HISTORY b/x11-toolkits/wxgtk/HISTORY index 731f6a0145..f58a948992 100644 --- a/x11-toolkits/wxgtk/HISTORY +++ b/x11-toolkits/wxgtk/HISTORY @@ -1,3 +1,6 @@ +2014-04-24 Thomas Orgis <sobukus@sourcemage.org> + * DEPENDS: ... and when MESALIB is mesalib-1x, depends on glu + 2014-04-14 Treeve Jelbert <treeve@sourcemage.org> * DEPENDS: mesalib => MESALIB diff --git a/x11/lightdm/DEPENDS b/x11/lightdm/DEPENDS index bcfb0ea897..6bc3c5a768 100755 --- a/x11/lightdm/DEPENDS +++ b/x11/lightdm/DEPENDS @@ -1,4 +1,5 @@ depends dbus && +depends libgcrypt && depends linux-pam && depends libxklavier && depends -sub XEPHYR xorg-server && diff --git a/x11/lightdm/DETAILS b/x11/lightdm/DETAILS index 5cfa381402..3f22bf9042 100755 --- a/x11/lightdm/DETAILS +++ b/x11/lightdm/DETAILS @@ -1,9 +1,8 @@ SPELL=lightdm - VERSION=1.7.0 + VERSION=1.8.0 SOURCE="${SPELL}-${VERSION}.tar.xz" SOURCE_URL[0]=http://launchpad.net/${SPELL}/1.8/$VERSION/+download/${SOURCE} -# SOURCE_HASH=sha512:e7a7fab1ad3b717e8c9de48e0337985ccbca5c3850697d59c910ed0a2418339207a1111e197f0f7a2a2b0ad6800373681c29d8f683e4a5ee3ae74a72b51e9da2 - SOURCE_GPG="gurus.gpg:${SOURCE}.sig:WORKS_FOR_ME" + SOURCE_HASH=sha512:770c92d28c9f76def517e1b4fed962b1852b0796e3068d2e6bbbe9ff4ba1182bbbc5148c4961b19e4f3ed2e5a943dd513d05fa74459a9a28ed1871bc6319fe64 SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}" WEB_SITE="https://launchpad.net/lightdm" LICENSE[0]=GPL3/LGPL3 diff --git a/x11/lightdm/HISTORY b/x11/lightdm/HISTORY index 4046b285a4..06706e9b1a 100644 --- a/x11/lightdm/HISTORY +++ b/x11/lightdm/HISTORY @@ -1,3 +1,6 @@ +2014-08-24 Thomas Orgis <sobukus@sourcemage.org> + * DETAILS: updated to 1.8.0 (removed sig) + 2013-06-04 Eric Sandall <sandalle@sourcemage.org> * DETAILS: Updated to 1.7.0, 1.5.1 no longer compiles * DEPENDS: Optionally depends on gettext diff --git a/x11/lightdm/lightdm-1.7.0.tar.xz.sig b/x11/lightdm/lightdm-1.7.0.tar.xz.sig Binary files differdeleted file mode 100644 index 00800999f5..0000000000 --- a/x11/lightdm/lightdm-1.7.0.tar.xz.sig +++ /dev/null diff --git a/xfce/garcon/DEPENDS b/xfce/garcon/DEPENDS index c7d17c2b78..485910a7d9 100755 --- a/xfce/garcon/DEPENDS +++ b/xfce/garcon/DEPENDS @@ -1,5 +1,5 @@ depends glib2 && - +depends libxfce4util && optional_depends gettext \ "--enable-nls" \ "--disable-nls" \ diff --git a/xfce/garcon/HISTORY b/xfce/garcon/HISTORY index 4f439d31f1..6d515fa846 100644 --- a/xfce/garcon/HISTORY +++ b/xfce/garcon/HISTORY @@ -1,3 +1,6 @@ +2014-08-24 Thomas Orgis <sobukus@sourcemage.org> + * DEPENDS: libxfce4util + 2013-06-14 Eric Sandall <sandalle@sourcemage.org> * DETAILS: Updated to 0.2.1 SOURCE matches upstream posted SHA1 diff --git a/xfce/libxfce4util/DEPENDS b/xfce/libxfce4util/DEPENDS index c7d17c2b78..817208d64a 100755 --- a/xfce/libxfce4util/DEPENDS +++ b/xfce/libxfce4util/DEPENDS @@ -1,4 +1,5 @@ depends glib2 && +depends intltool && optional_depends gettext \ "--enable-nls" \ diff --git a/xfce/libxfce4util/HISTORY b/xfce/libxfce4util/HISTORY index ff50040a94..030b575d2f 100644 --- a/xfce/libxfce4util/HISTORY +++ b/xfce/libxfce4util/HISTORY @@ -1,3 +1,6 @@ +2014-08-24 Thomas Orgis <sobukus@sourcemage.org> + * DEPENDS: intltool + 2013-06-14 Eric Sandall <sandalle@sourcemage.org> * DETAILS: Updated to 4.10.1 SOURCE matches upstream posted SHA1 diff --git a/xorg-xserver/xorg-server/HISTORY b/xorg-xserver/xorg-server/HISTORY index 9f31ea925b..0047be6b92 100644 --- a/xorg-xserver/xorg-server/HISTORY +++ b/xorg-xserver/xorg-server/HISTORY @@ -2,9 +2,8 @@ * DEPENDS: needs xcb cruft to build 2014-08-19 Treeve Jelbert <treeve@sourcemage.org> - * DEPENDS: openssl => SSL - - * SUB_DEPENDS, PRE_SUB_DEPENDS: openssl => SSL + * DEPENDS: openssl => SSL + * SUB_DEPENDS, PRE_SUB_DEPENDS: openssl => SSL 2014-07-18 Sukneet Basuta <sukneet@sourcemage.org> * CONFIGURE: missed an 'a' in 'disable-glamor' |