diff options
118 files changed, 927 insertions, 154 deletions
@@ -1,3 +1,22 @@ +2013-11-24 Treeve Jelbert <treeve@sourcemage.org> + * FUNCTIONS: fix for python2 usage when it is not primary installation + +2013-11-24 Jeremy Blosser <jblosser@sourcemage.org> + * python-pypi/viridian: new spell, ampache client in python + +2013-11-24 Ismael Luceno <ismael@sourcemage.org> + * net/cgminer: new spell, multi-threaded multi-pool FPGA and ASIC miner for bitcoin + +2013-11-20 Treeve Jelbert <treeve@sourcemage.org> + * FUNCTIONS,python-pypi/PY_DEPENDS: fix builds involving python3.3 + +2013-11-20 Vlad Glagolev <stealth@sourcemage.org> + * loop-AES.gpg: added 8132F189 public key (Jari Ruusu (2013) + <jariruusu@users.sourceforge.net>) + +2013-11-17 Robin Cook <rcook@wyrms.net> + * libs/iec16022: new spell, library for DataMatrix barcodes + 2013-11-10 Treeve Jelbert <treeve@sourcemage.org> * qt5/qbs: new spell, build system for qt @@ -2,6 +2,18 @@ . $GRIMOIRE/libgcc . $GRIMOIRE/config_query_multi.function +if is_depends_enabled $SPELL python;then + VV=`installed_version python1 | cut -c-3` && + PYTHON2=/usr/bin/python${VV} + export PYTHON=$PYTHON2 +fi + +if is_depends_enabled $SPELL python3;then + VV=`installed_version python3 | cut -c-3` && + PYTHON3=/usr/bin/python${VV}m + export PYTHON=$PYTHON3 +fi + QT5DIR=$INSTALL_ROOT/opt/qt5 qt5_build() { export PKG_CONFIG_PATH="$QT5DIR/lib/pkgconfig" @@ -441,28 +453,28 @@ function unpack_file() { ## Default build for Python2 spell. #------------------------------------------------------------------------- function default_build_python() { - python2 setup.py build "$@" + $PYTHON2 setup.py build "$@" } #------------------------------------------------------------------------- ## Default build for Python 3 spell. #------------------------------------------------------------------------- function default_build_python3() { - python3 setup.py build "$@" + $PYTHON3 setup.py build "$@" } #------------------------------------------------------------------------- ## Default install for Python spell. #------------------------------------------------------------------------- function default_install_python() { - python2 setup.py install --root "$INSTALL_ROOT/" "$@" + $PYTHON2 setup.py install --root "$INSTALL_ROOT/" "$@" } #------------------------------------------------------------------------- ## Default install for Python 3 spell. #------------------------------------------------------------------------- function default_install_python3() { - python3 setup.py install --root "$INSTALL_ROOT/" "$@" + $PYTHON3 setup.py install --root "$INSTALL_ROOT/" "$@" } #------------------------------------------------------------------------- diff --git a/collab/openldap/DETAILS b/collab/openldap/DETAILS index 758be7524c..bc0d05661d 100755 --- a/collab/openldap/DETAILS +++ b/collab/openldap/DETAILS @@ -1,12 +1,12 @@ SPELL=openldap if [[ $OPENLDAP_BRANCH == stable ]]; then - VERSION=2.4.37 + VERSION=2.4.38 SOURCE=$SPELL-$VERSION.tgz - SOURCE_HASH=sha512:027ff8565ceeed427d801d3de6aa93b0a7db5865703aee20e84ee0c86c30dbf29bba081e0bb94fcb43e26e0d05c375c1968c30c32394c1bdb20207c6bfd5a703 + SOURCE_HASH=sha512:df7b6b2b84102ba996f84575396c7505ada851b5f09841fd821d34fd8d62580f85ecc655e2cd3965730b44d6919d64864f56b23791f38b411d142d345f250666 else - VERSION=2.4.37 + VERSION=2.4.38 SOURCE=$SPELL-$VERSION.tgz - SOURCE_HASH=sha512:027ff8565ceeed427d801d3de6aa93b0a7db5865703aee20e84ee0c86c30dbf29bba081e0bb94fcb43e26e0d05c375c1968c30c32394c1bdb20207c6bfd5a703 + SOURCE_HASH=sha512:df7b6b2b84102ba996f84575396c7505ada851b5f09841fd821d34fd8d62580f85ecc655e2cd3965730b44d6919d64864f56b23791f38b411d142d345f250666 fi SECURITY_PATCH=2 SOURCE_URI=$SPELL-release/$SOURCE diff --git a/collab/openldap/HISTORY b/collab/openldap/HISTORY index 224971671d..6eb5d598c6 100644 --- a/collab/openldap/HISTORY +++ b/collab/openldap/HISTORY @@ -1,3 +1,6 @@ +2013-11-18 Vlad Glagolev <stealth@sourcemage.org> + * DETAILS: updated spell to 2.4.38 + 2013-10-29 Vlad Glagolev <stealth@sourcemage.org> * DETAILS: updated spell to 2.4.37 diff --git a/crypto/gnutls/DETAILS b/crypto/gnutls/DETAILS index 6eb3fd4e27..ea491b2507 100755 --- a/crypto/gnutls/DETAILS +++ b/crypto/gnutls/DETAILS @@ -55,7 +55,7 @@ case $GNUTLS_BRANCH in SOURCE=$SPELL-$VERSION.tar.xz ;; 3.2) - VERSION=3.2.5 + VERSION=3.2.7 SOURCE=$SPELL-$VERSION.tar.xz ;; esac diff --git a/crypto/gnutls/HISTORY b/crypto/gnutls/HISTORY index 54b0a6f78e..0883ba5bbf 100644 --- a/crypto/gnutls/HISTORY +++ b/crypto/gnutls/HISTORY @@ -1,3 +1,6 @@ +2013-11-26 Treeve Jelbert <treeve@sourcemage.org> + * DETAILS: 3.2.7 + 2013-10-26 Treeve Jelbert <treeve@sourcemage.org> * DETAILS: 3.2.5 SECURITY_PATCH++ fixes CVE-2013-4466 diff --git a/crypto/libssh/DETAILS b/crypto/libssh/DETAILS index c5b58ab8fc..d353fc2d6f 100755 --- a/crypto/libssh/DETAILS +++ b/crypto/libssh/DETAILS @@ -1,11 +1,11 @@ SPELL=libssh - VERSION=0.5.4 - SOURCE_HASH=sha512:1d854ee05e62e9e04ac704bc99a60b6f88237078b728e50e3e0f1142fbc5d1a4b4d04d675f257491c82c8b222b97db7a7f8e243f4a0f723e82788ecef3a7a71d + VERSION=0.5.5 + SOURCE_HASH=sha512:114a8d078b9530fe37f12c769283213ceacdd8cbf0c1c3e64e09c07d38b3886bc8c9a78816562ab1bc44c55c604fcc4ed85cdb2a8203962c9331f9d10977e802 SECURITY_PATCH=3 SOURCE=$SPELL-$VERSION.tar.gz # SOURCE2=$SOURCE.asc SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION - SOURCE_URL[0]=https://red.libssh.org/attachments/download/41/$SOURCE + SOURCE_URL[0]=https://red.libssh.org/attachments/download/51/$SOURCE SOURCE_HINTS[0]="no-check-certificate" #SOURCE2_HINTS[0]="no-check-certificate" WEB_SITE=http://www.libssh.org/ diff --git a/crypto/libssh/HISTORY b/crypto/libssh/HISTORY index 4d17e2b68b..57cd48188d 100644 --- a/crypto/libssh/HISTORY +++ b/crypto/libssh/HISTORY @@ -1,3 +1,6 @@ +2013-11-17 Treeve Jelbert <treeve@sourcemage.org> + * DETAILS: version 0.5.5 + 2013-02-11 Treeve Jelbert <treeve@sourcemage.org> * DETAILS: version 0.5.4 SECURITY_PATCH++, fixes CVE-2013-0176 diff --git a/devel/python3/DETAILS b/devel/python3/DETAILS index 043d790b91..6fef0d9b10 100755 --- a/devel/python3/DETAILS +++ b/devel/python3/DETAILS @@ -1,7 +1,7 @@ SPELL=python3 - VERSION=3.3.2 + VERSION=3.3.3 SECURITY_PATCH=2 - SOURCE=Python-$VERSION.tar.bz2 + SOURCE=Python-$VERSION.tgz SOURCE2=$SOURCE.asc SOURCE_DIRECTORY="$BUILD_DIRECTORY/Python-$VERSION" SOURCE_URL[0]=http://www.python.org/ftp/python/$VERSION/$SOURCE diff --git a/devel/python3/HISTORY b/devel/python3/HISTORY index b3d2134470..d403e62461 100644 --- a/devel/python3/HISTORY +++ b/devel/python3/HISTORY @@ -1,3 +1,6 @@ +2013-11-19 Ladislav Hagara <hgr@vabo.cz> + * DETAILS: 3.3.3 + 2013-06-04 Treeve Jelbert <treeve@sourcemage.org> * DETAILS: version 3.3.2 diff --git a/doc/dvipdfmx/DETAILS b/doc/dvipdfmx/DETAILS index cfab9cfb31..44b1e38be3 100755 --- a/doc/dvipdfmx/DETAILS +++ b/doc/dvipdfmx/DETAILS @@ -2,6 +2,7 @@ VERSION=20110311 SOURCE="$SPELL-${VERSION}.tar.gz" SOURCE_URL[0]=http://project.ktug.or.kr/$SPELL/snapshot/latest/${SOURCE} + SOURCE_URL[1]=http://mirrors.ctan.org/dviware/dvipdfmx/${SOURCE} SOURCE_HASH=sha512:0d5fc5dba35b0fe7074a392a99338861ce999809e5c20da830ebd6ba4c8ba45819054463862f3025d3a30c78aad227d3e014651ebf5e7976e86a3d9dac93d406 SOURCE_DIRECTORY="${BUILD_DIRECTORY}/$SPELL-${VERSION}" WEB_SITE="http://project.ktug.or.kr/dvipdfmx/" diff --git a/doc/dvipdfmx/HISTORY b/doc/dvipdfmx/HISTORY index c3b78619cf..ccc57aa64e 100644 --- a/doc/dvipdfmx/HISTORY +++ b/doc/dvipdfmx/HISTORY @@ -1,3 +1,6 @@ +2013-11-18 Remko van der Vossen <wich@sourcemage.org> + * DETAILS: add alternative download location + 2012-12-24 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de> * DETAILS: version 20110311 diff --git a/graphics/gimp/DETAILS b/graphics/gimp/DETAILS index 76fd9111c8..cb048d47cd 100755 --- a/graphics/gimp/DETAILS +++ b/graphics/gimp/DETAILS @@ -1,13 +1,13 @@ SPELL=gimp if [[ $GIMP_DEVEL == y ]]; then - VERSION=2.8.8 + VERSION=2.8.10 SOURCE=$SPELL-$VERSION.tar.bz2 - SOURCE_HASH=sha512:3c841c1d11ac41eb5a4ae9d039c339d91eec7b05a303efa6a10ea9cb1af3d56c9b8a55f752c8f4c50ddddca3fbe220949d6e22838c71d5f9dfba9fab922bf8c3 + SOURCE_HASH=sha512:21c96832ce61ecb2dad5276b454e7965263b6733add7e4a95cfc5f308fca681bceab21c1b77921332e0725d0e514e06868a4698ca9d7e4b30a28a07c7356a3a8 SOURCE_URL[0]=ftp://ftp.gimp.org/pub/gimp/v${VERSION%.*}/$SOURCE else - VERSION=2.8.8 + VERSION=2.8.10 SOURCE=$SPELL-$VERSION.tar.bz2 - SOURCE_HASH=sha512:3c841c1d11ac41eb5a4ae9d039c339d91eec7b05a303efa6a10ea9cb1af3d56c9b8a55f752c8f4c50ddddca3fbe220949d6e22838c71d5f9dfba9fab922bf8c3 + SOURCE_HASH=sha512:21c96832ce61ecb2dad5276b454e7965263b6733add7e4a95cfc5f308fca681bceab21c1b77921332e0725d0e514e06868a4698ca9d7e4b30a28a07c7356a3a8 SOURCE_URL[0]=ftp://ftp.gimp.org/pub/gimp/v${VERSION%.*}/$SOURCE # SOURCE_GPG=gurus.gpg:$SOURCE.sig fi diff --git a/graphics/gimp/HISTORY b/graphics/gimp/HISTORY index 0e0563fcc7..66d930e5ae 100644 --- a/graphics/gimp/HISTORY +++ b/graphics/gimp/HISTORY @@ -1,3 +1,6 @@ +2013-11-29 Ladislav Hagara <hgr@vabo.cz> + * DETAILS: 2.8.10 + 2013-11-06 Ladislav Hagara <hgr@vabo.cz> * DETAILS: 2.8.8 diff --git a/http/firefox/DETAILS b/http/firefox/DETAILS index afcb691220..14030184f5 100755 --- a/http/firefox/DETAILS +++ b/http/firefox/DETAILS @@ -1,18 +1,18 @@ SPELL=firefox if [[ $FIREFOX_CVS == y ]]; then - VERSION=25.0 + VERSION=25.0.1 SOURCE=$SPELL-$VERSION.source.tar.bz2 - SOURCE_HASH=sha512:debec2cc87da1e68739ddadcb35a027cf6f980471c85ea2e6a85f5b0b4861415659c74b5e57b6cb06bcdf6ecf4722e1c08d98a4256aefdf5bf285c9806f5a13f + SOURCE_HASH=sha512:7f6cef8dec77d9e43a11f35d5cbae267e71327caa0d63a713ef8579bc45a921c7211d14354da1856d3d7b25c7ca99abf463682873f07fc5a4543c64d589be0f0 SOURCE_URL[0]=http://releases.mozilla.org/pub/mozilla.org/${SPELL}/releases/${VERSION}/source/${SOURCE} else - VERSION=25.0 + VERSION=25.0.1 SOURCE=$SPELL-$VERSION.source.tar.bz2 - SOURCE_HASH=sha512:debec2cc87da1e68739ddadcb35a027cf6f980471c85ea2e6a85f5b0b4861415659c74b5e57b6cb06bcdf6ecf4722e1c08d98a4256aefdf5bf285c9806f5a13f + SOURCE_HASH=sha512:7f6cef8dec77d9e43a11f35d5cbae267e71327caa0d63a713ef8579bc45a921c7211d14354da1856d3d7b25c7ca99abf463682873f07fc5a4543c64d589be0f0 SOURCE_URL[0]=http://releases.mozilla.org/pub/mozilla.org/${SPELL}/releases/${VERSION}/source/${SOURCE} SOURCE_URL[1]=ftp://ftp.mozilla.org/pub/$SPELL/releases/$VERSION/source/$SOURCE SOURCE_URL[2]=ftp://ftp.in2p3.fr/pub/mozilla/$SPELL/releases/$VERSION/source/$SOURCE - SECURITY_PATCH=68 fi + SECURITY_PATCH=69 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION" WEB_SITE=https://www.mozilla.org/en-US/firefox/fx/ GATHER_DOCS=off diff --git a/http/firefox/HISTORY b/http/firefox/HISTORY index af56c1f21f..76256d99df 100644 --- a/http/firefox/HISTORY +++ b/http/firefox/HISTORY @@ -1,3 +1,6 @@ +2013-11-17 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de> + * DETAILS: version 25.0.1, SECURITY_PATCH++ + 2013-10-29 Ladislav Hagara <hgr@vabo.cz> * DETAILS: 25.0, SECURITY_PATCH=68 diff --git a/http/midori/BUILD b/http/midori/BUILD index d31f4a9f95..e013b8d866 100755 --- a/http/midori/BUILD +++ b/http/midori/BUILD @@ -1,2 +1 @@ -./waf --prefix=${INSTALL_ROOT}/usr $OPTS configure && -./waf build +cmake_build diff --git a/http/midori/DETAILS b/http/midori/DETAILS index 71c3c47706..e9ab7933d9 100755 --- a/http/midori/DETAILS +++ b/http/midori/DETAILS @@ -11,11 +11,11 @@ if [[ $MIDORI_BRANCH == scm ]]; then FORCE_DOWNLOAD=on SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-git" else - VERSION=0.5.5 + VERSION=0.5.6 BRANCH=`echo $VERSION | cut -d . -f 1,2` SOURCE=${SPELL}_${VERSION}_all_.tar.bz2 SOURCE_URL[0]=http://www.midori-browser.org/downloads/$SOURCE - SOURCE_HASH=sha512:89d1ddb461af460a83744cc761989d430750dcef9565ac98960c1c87e6082ebb35e61c4f21f28891a19119e2733dc8a6440bc51c0bd206c37ac068e434fc0231 + SOURCE_HASH=sha512:42d67ab55b2586098f88088e7c72eda4daebf667881d464fd08b03c076557dfa9c1a62bff3924285a7c67f9fb9f0e1cd044703244caad2c00e4a88cb88569ee7 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION" fi WEB_SITE=http://twotoasts.de/index.php/midori/ diff --git a/http/midori/HISTORY b/http/midori/HISTORY index 1557c842ac..f30e85f71b 100644 --- a/http/midori/HISTORY +++ b/http/midori/HISTORY @@ -1,3 +1,7 @@ +2013-11-20 Ladislav Hagara <hgr@vabo.cz> + * DETAILS: 0.5.6 + * BUILD, INSTALL: waf -> cmake + 2013-08-15 Ladislav Hagara <hgr@vabo.cz> * DETAILS: 0.5.5, SOURCE and SOURCE_URL[0] updated diff --git a/http/midori/INSTALL b/http/midori/INSTALL index d0ab8dd03e..bea23506d3 100755 --- a/http/midori/INSTALL +++ b/http/midori/INSTALL @@ -1,4 +1,4 @@ -./waf install && +default_install && cp -v "$SPELL_DIRECTORY/midori.sh" "$INSTALL_ROOT/etc/profile.d" && diff --git a/http/nginx/DETAILS b/http/nginx/DETAILS index 118383dee6..153cec6d51 100755 --- a/http/nginx/DETAILS +++ b/http/nginx/DETAILS @@ -7,18 +7,19 @@ fi case "$NGINX_RELEASE" in stable) VERSION=1.0.15 - SECURITY_PATCH=3 + SECURITY_PATCH=4 ;; legacy) VERSION=0.8.55 + SECURITY_PATCH=1 ;; old) VERSION=0.7.69 - SECURITY_PATCH=2 + SECURITY_PATCH=3 ;; devel) VERSION=1.1.19 - SECURITY_PATCH=3 + SECURITY_PATCH=4 ;; esac SOURCE=$SPELL-$VERSION.tar.gz diff --git a/http/nginx/HISTORY b/http/nginx/HISTORY index f412678e93..ec0a8ff9d9 100644 --- a/http/nginx/HISTORY +++ b/http/nginx/HISTORY @@ -1,3 +1,8 @@ +2013-11-21 Vlad Glagolev <stealth@sourcemage.org> + * DETAILS: SECURITY_PATCH++ + * PRE_BUILD: apply patch + * space.patch: added, to fix CVE-2013-4547 + 2012-08-24 Vlad Glagolev <stealth@sourcemage.org> * DETAILS, BUILD, PRE{PARE,_BUILD}: added dav_ext module * CONFIGURE: generic dav module is required for dav_ext module diff --git a/http/nginx/PRE_BUILD b/http/nginx/PRE_BUILD index fb5c9faa90..1491440986 100755 --- a/http/nginx/PRE_BUILD +++ b/http/nginx/PRE_BUILD @@ -3,6 +3,8 @@ default_pre_build && cd "$SOURCE_DIRECTORY" && +patch -p0 < "$SPELL_DIRECTORY/space.patch" && + if [[ $NGINX_SYSLOG == y ]]; then if is_version_less $VERSION 0.8; then patch -p0 < "$SPELL_DIRECTORY/syslog-0.7.patch" diff --git a/http/nginx/space.patch b/http/nginx/space.patch new file mode 100644 index 0000000000..e6bda8485e --- /dev/null +++ b/http/nginx/space.patch @@ -0,0 +1,18 @@ +--- src/http/ngx_http_parse.c ++++ src/http/ngx_http_parse.c +@@ -617,6 +617,7 @@ ngx_http_parse_request_line(ngx_http_req + default: + r->space_in_uri = 1; + state = sw_check_uri; ++ p--; + break; + } + break; +@@ -670,6 +671,7 @@ ngx_http_parse_request_line(ngx_http_req + default: + r->space_in_uri = 1; + state = sw_uri; ++ p--; + break; + } + break; diff --git a/kde4-apps/clementine/DETAILS b/kde4-apps/clementine/DETAILS index 655808ef70..3618554206 100755 --- a/kde4-apps/clementine/DETAILS +++ b/kde4-apps/clementine/DETAILS @@ -1,11 +1,11 @@ SPELL=clementine - VERSION=1.2.0 + VERSION=1.2.1 SOURCE=$SPELL-$VERSION.tar.gz SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION SOURCE_URL[0]=http://clementine-player.googlecode.com/files/$SOURCE WEB_SITE=http://www.clementine-player.org/ ENTERED=20131015 - SOURCE_HASH=sha512:b7a084f74b1469b8544326a798642aa6a96ff286f1495033e048a0313dca2c365542aabccd00fa3d01399d65a0301068aa93b3b2f6606f84950c51c2e6ef8066 + SOURCE_HASH=sha512:92801d8e26528eb66f51b81b973922465b37a515b3271358239500ec61ec658f0383f5fdfb79f1ed9ca8890fa1f08de498c80f99b6852d850c979729775daadc LICENSE[0]=GPL SHORT="music player" cat << EOF diff --git a/kde4-apps/clementine/HISTORY b/kde4-apps/clementine/HISTORY index c2166e5693..e942abd3d4 100644 --- a/kde4-apps/clementine/HISTORY +++ b/kde4-apps/clementine/HISTORY @@ -1,2 +1,5 @@ +2013-11-26 Ladislav Hagara <hgr@vabo.cz> + * DETAILS: 1.2.1 + 2013-10-15 Ladislav Hagara <hgr@vabo.cz> * DETAILS, DEPENDS: spell created, version 1.2 diff --git a/kde4-apps/rekonq/DETAILS b/kde4-apps/rekonq/DETAILS index 8c614ee4fd..85c4a21145 100755 --- a/kde4-apps/rekonq/DETAILS +++ b/kde4-apps/rekonq/DETAILS @@ -1,7 +1,7 @@ SPELL=rekonq - VERSION=2.3.2 - SOURCE_HASH=sha512:cdb60c86f80bb3ba14ae53660cca971880880f5cb5fe28326d85c89baab4a5cdaab993d65628d3ca12efc2045316d715c9eb25351927e6838aec1e2d1249ebc5 - SOURCE=$SPELL-$VERSION.tar.bz2 + VERSION=2.4.0 + SOURCE_HASH=sha512:bfc07ceda7d0bd1636aee5840dacd44b7216827b2bf9c48af40de3b5b9a5077fc0242acbf71950590753ed576336d67908d85c3c010b5a67a5d83f411d6722c5 + SOURCE=$SPELL-$VERSION.tar.xz SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE WEB_SITE=http://rekonq.kde.org/ diff --git a/kde4-apps/rekonq/HISTORY b/kde4-apps/rekonq/HISTORY index b567cc73f0..7670161861 100644 --- a/kde4-apps/rekonq/HISTORY +++ b/kde4-apps/rekonq/HISTORY @@ -1,3 +1,6 @@ +2013-11-20 Ladislav Hagara <hgr@vabo.cz> + * DETAILS: 2.4.0 + 2013-07-01 Ladislav Hagara <hgr@vabo.cz> * DETAILS: 2.3.2 diff --git a/kernels/linux/HISTORY b/kernels/linux/HISTORY index fbb9ff5f19..262414118d 100644 --- a/kernels/linux/HISTORY +++ b/kernels/linux/HISTORY @@ -1,3 +1,7 @@ +2013-10-18 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de> + * info/patches/maintenance_patches_3/patch-3.12.1: added + * latest_defaults: version 3.12.1 + 2013-11-04 Ladislav Hagara <hgr@vabo.cz> * latest.defaults: LATEST_maintenance_patches_3=3.12, LATEST_3=3.12 * info/kernels/3.12: added diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.12.1 b/kernels/linux/info/patches/maintenance_patches_3/patch-3.12.1 new file mode 100755 index 0000000000..be68c7433b --- /dev/null +++ b/kernels/linux/info/patches/maintenance_patches_3/patch-3.12.1 @@ -0,0 +1,5 @@ +appliedkernels="3.12" +patchversion="${appliedkernels}.1" +source="patch-${patchversion}.bz2" +source_url="${KERNEL_URL}/pub/linux/kernel/v3.x/${source}" +sha1sum="1ea21c76db43132e0eb138016fe5d5df37afb4a5" diff --git a/kernels/linux/latest.defaults b/kernels/linux/latest.defaults index 3067bca9de..dd7de259df 100644 --- a/kernels/linux/latest.defaults +++ b/kernels/linux/latest.defaults @@ -2,7 +2,7 @@ LATEST_3=3.12 LATEST_2_6=2.6.39 LATEST_PRE_2_6=patch-2.6.39 LATEST_maintenance_patches=patch-2.6.39.4 -LATEST_maintenance_patches_3=patch-3.12 +LATEST_maintenance_patches_3=patch-3.12.1 LATEST_git_patches=patch-2.6.25-rc6-git7 LATEST_2_4=2.4.37.9 LATEST_PRE_2_4=patch-2.4.33-pre1 diff --git a/latex/texlive/HISTORY b/latex/texlive/HISTORY index a527ec949e..0b129dc3cb 100644 --- a/latex/texlive/HISTORY +++ b/latex/texlive/HISTORY @@ -1,3 +1,7 @@ +2013-11-18 Remko van der Vossen <wich@sourcemage.org> + * INSTALL: do not try to install luatex fonts if lua dependency is not + enabled. + 2013-06-08 Thomas Orgis <sobukus@sourcemage.org> * INSTALL: hack to install a copy of TeXLive::TLUtils to make updmap work * BUILD: Do not disable gsftopk; who else provides it? diff --git a/latex/texlive/INSTALL b/latex/texlive/INSTALL index b16cf99e84..21866c0159 100755 --- a/latex/texlive/INSTALL +++ b/latex/texlive/INSTALL @@ -11,6 +11,11 @@ ln -svf mf ${INSTALL_ROOT}/usr/bin/mf-nowin && # don't create aleph files sed -i -e '/aleph/d' ${INSTALL_ROOT}/usr/share/texmf/web2c/fmtutil.cnf && +# remove luatex stuff from config file if not enabled +if ! depends_is_enabled $SPELL lua51; then + sed -i -e '/luatex/d' ${INSTALL_ROOT}/usr/share/texmf/web2c/fmtutil.cnf +fi && + # create symlinks to latex, pdflatex, etc ${INSTALL_ROOT}/usr/bin/texlinks -f ${INSTALL_ROOT}/usr/share/texmf/web2c/fmtutil.cnf ${INSTALL_ROOT}/usr/bin && diff --git a/libs/iec16022/DEPENDS b/libs/iec16022/DEPENDS new file mode 100755 index 0000000000..a69c83fa72 --- /dev/null +++ b/libs/iec16022/DEPENDS @@ -0,0 +1,2 @@ +depends libz && +depends popt diff --git a/libs/iec16022/DETAILS b/libs/iec16022/DETAILS new file mode 100755 index 0000000000..5d82752416 --- /dev/null +++ b/libs/iec16022/DETAILS @@ -0,0 +1,13 @@ + SPELL=iec16022 + VERSION=0.2.4 + SOURCE="${SPELL}-${VERSION}.tar.gz" + SOURCE_URL[0]=http://datenfreihafen.org/~stefan/$SPELL/$SOURCE +SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}" + SOURCE_HASH=sha512:4e997a6c224bb7f2a0c2e7a2e22641c7bdce72e1da9bd580efe4ed923a0a80d0ac32d960549c757edabdf214f9d6daca3755c32df00f6a4e3e5d1d2005031cb4 + WEB_SITE=http://datenfreihafen.org/projects/iec16022.html + LICENSE[0]= + ENTERED=20131117 + SHORT="library for DataMatrix barcodes" +cat << EOF +With iec16022 you can produce 2D barcodes often also referenced as DataMatrix. +EOF diff --git a/libs/iec16022/HISTORY b/libs/iec16022/HISTORY new file mode 100644 index 0000000000..f1b37cfac0 --- /dev/null +++ b/libs/iec16022/HISTORY @@ -0,0 +1,2 @@ +2013-11-17 Robin Cook <rcook@wyrms.net> + * DETAILS, DEPENDS: spell created diff --git a/libs/libxml2/BUILD b/libs/libxml2/BUILD deleted file mode 100755 index 10eb6b82d3..0000000000 --- a/libs/libxml2/BUILD +++ /dev/null @@ -1,7 +0,0 @@ -if is_depends_enabled $SPELL python3;then - export PYTHON=/usr/bin/python3 -fi && -if is_depends_enabled $SPELL python;then - export PYTHON=/usr/bin/python2.7 -fi && -default_build diff --git a/libs/libxml2/HISTORY b/libs/libxml2/HISTORY index d0a1e129e9..a271d2ffbf 100644 --- a/libs/libxml2/HISTORY +++ b/libs/libxml2/HISTORY @@ -1,3 +1,6 @@ +2013-11-21 Treeve Jelbert <treeve@sourcemage.org> + * BUILD: deleted, python usege is solved in FUNCTIONS + 2013-07-25 Treeve Jelbert <treeve@sourcemage.org> * SUB_DEPENDS, PRE_SUB_DEPENDS: adjust to python3 * BUILD: added, fix detection of python3 diff --git a/libs/nspr/DETAILS b/libs/nspr/DETAILS index 544bffcf3b..bffa731983 100755 --- a/libs/nspr/DETAILS +++ b/libs/nspr/DETAILS @@ -1,6 +1,6 @@ SPELL=nspr - VERSION=4.10.1 - SOURCE_HASH=sha512:80b8895a104317dd18d19e813ecf91f081d85b36320b3e3898802f653b5e29320667729208178b3ca556a4066906774d446193cba76caafef002b1d7b240e249 + VERSION=4.10.2 + SOURCE_HASH=sha512:bb45c7a23c1bc38433520bfa71309085c25e65d004a3012c60e66c4f31fb6fdc45406cbd6228a5fdd89dfb02cd9badb5a3961186c32898aa456b04f0b6f53698 SOURCE=$SPELL-$VERSION.tar.gz SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION" SOURCE_URL[0]=http://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v$VERSION/src/$SOURCE diff --git a/libs/nspr/HISTORY b/libs/nspr/HISTORY index 7b2a124aae..f9b74fc686 100644 --- a/libs/nspr/HISTORY +++ b/libs/nspr/HISTORY @@ -1,3 +1,6 @@ +2013-11-17 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de> + * DETAILS: version 4.10.2 + 2013-10-17 Treeve Jelbert <treeve@sourcemage.org> * DETAILS: version 4.10.1 diff --git a/libs/tevent/HISTORY b/libs/tevent/HISTORY index 95eec09484..7367a6e7f0 100644 --- a/libs/tevent/HISTORY +++ b/libs/tevent/HISTORY @@ -1,3 +1,6 @@ +2013-11-23 Eric Sandall <sandalle@sourcemage.org> + * PRE_BUILD: Removed, I don't even know, but it doesn't work (no files) + 2013-02-08 Sukneet Basuta <sukneet@sourcemage.org> * DETAILS: remove git version, add stable 0.9.17 git version removed because it checks out entire samba4 and it was broken diff --git a/libs/tevent/PRE_BUILD b/libs/tevent/PRE_BUILD deleted file mode 100755 index d2974e51d6..0000000000 --- a/libs/tevent/PRE_BUILD +++ /dev/null @@ -1,8 +0,0 @@ -message "${MESSAGE_COLOR}gunzip $SOURCE_CACHE/$SOURCE${DEFAULT_COLOR}" -SOURCE_ORI=${SOURCE} -SOURCE=${SOURCE/.gz} -gunzip -c ${SOURCE_CACHE}/$SOURCE_ORI > $SOURCE -default_pre_build -message "${MESSAGE_COLOR}rm $SOURCE${DEFAULT_COLOR}" -rm $SOURCE -SOURCE=${SOURCE_ORI} diff --git a/loop-AES.gpg b/loop-AES.gpg Binary files differindex 0409475466..506cfa3d6e 100644 --- a/loop-AES.gpg +++ b/loop-AES.gpg diff --git a/net/cgminer/BUILD b/net/cgminer/BUILD new file mode 100755 index 0000000000..c616caf75a --- /dev/null +++ b/net/cgminer/BUILD @@ -0,0 +1,2 @@ +OPTS="$OPTS $CGMINER_OPTS" && +default_build diff --git a/net/cgminer/CONFIGURE b/net/cgminer/CONFIGURE new file mode 100755 index 0000000000..45b3762204 --- /dev/null +++ b/net/cgminer/CONFIGURE @@ -0,0 +1,29 @@ +config_query_option CGMINER_OPTS "Avalon support" n \ + --{en,dis}able-avalon && + +config_query_option CGMINER_OPTS "BlackArrow Bitfury support" n \ + --{en,dis}able-bab && + +config_query_option CGMINER_OPTS "BFL ASIC support" n \ + --{en,dis}able-bflsc && + +config_query_option CGMINER_OPTS "BitForce FPGA support" n \ + --{en,dis}able-bitforce && + +config_query_option CGMINER_OPTS "BitFury ASIC support" n \ + --{en,dis}able-bitfury && + +config_query_option CGMINER_OPTS "Hashfast support" n \ + --{en,dis}able-hashfast && + +config_query_option CGMINER_OPTS "Icarus support" n \ + --{en,dis}able-icarus && + +config_query_option CGMINER_OPTS "Klondike support" n \ + --{en,dis}able-klondike && + +config_query_option CGMINER_OPTS "KnC support" n \ + --{en,dis}able-knc && + +config_query_option CGMINER_OPTS "ModMiner FPGA support" n \ + --{en,dis}able-modminer diff --git a/net/cgminer/DEPENDS b/net/cgminer/DEPENDS new file mode 100755 index 0000000000..73c610bda5 --- /dev/null +++ b/net/cgminer/DEPENDS @@ -0,0 +1,11 @@ +optional_depends curl \ + --{en,dis}able-libcurl \ + "getwork and GBT support" && + +optional_depends ncurses \ + --with{,out}-curses \ + "curses user interface" && + +optional_depends LIBUSB \ + --with{,out}-system-libusb \ + "Compile against system libusb (otherwise uses built-in)" diff --git a/net/cgminer/DETAILS b/net/cgminer/DETAILS new file mode 100755 index 0000000000..20323ed2bf --- /dev/null +++ b/net/cgminer/DETAILS @@ -0,0 +1,21 @@ + SPELL=cgminer + VERSION=3.8.3 + SOURCE="${SPELL}-${VERSION}.tar.bz2" + SOURCE_URL[0]=http://ck.kolivas.org/apps/${SPELL}/${SOURCE} + SOURCE_HASH=sha512:5a99297152b65e886b7aa0b4ba23e5c6557a98efcc6d6ce675fc72774a18eb172caf3f9cd21d90fa062ea77d4914920e18940eede198d1ed954109a3c2a50df1 +SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}" + WEB_SITE="http://ck.kolivas.org/apps/cgminer/" + LICENSE[0]="GPLv3" + ENTERED=20131124 + KEYWORDS="" + SHORT="multi-threaded multi-pool FPGA and ASIC miner for bitcoin" +cat << EOF +This is a multi-threaded multi-pool FPGA and ASIC miner for bitcoin. + +This code is provided entirely free of charge by the programmer in his spare +time so donations would be greatly appreciated. Please consider donating to +the address below. + +Con Kolivas <kernel@kolivas.org> +15qSxP1SQcUX3o4nhkfdbgyoWEFMomJ4rZ +EOF diff --git a/net/cgminer/HISTORY b/net/cgminer/HISTORY new file mode 100644 index 0000000000..a3acc5d5c1 --- /dev/null +++ b/net/cgminer/HISTORY @@ -0,0 +1,2 @@ +2013-11-24 Ismael Luceno <ismael@sourcemage.org> + * BUILD, CONFIGURE, DEPENDS, DETAILS: spell created diff --git a/net/cpuminer/DETAILS b/net/cpuminer/DETAILS index b28c45c980..afbca36cdc 100755 --- a/net/cpuminer/DETAILS +++ b/net/cpuminer/DETAILS @@ -1,8 +1,8 @@ SPELL=cpuminer - VERSION=1.0.1 - SOURCE="${SPELL}-${VERSION}.tar.gz" - SOURCE_URL[0]=http://yyz.us/bitcoin/${SOURCE} - SOURCE_HASH=sha512:a5333ca8b505de458c3faf6601aef14743ef1e55f190b8a7c8db5b3484bc01cb698988d5a273ad15b9a8b0161ce611a18ca538db8ab17406bf4269e0084272fa + VERSION=2.3.2 + SOURCE="pooler-${SPELL}-${VERSION}.tar.gz" + SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE + SOURCE_HASH=sha512:8c1e82651f8a1538ae636eab5458b82c9f2733484b8461fefcbfff32e1827976661d2d47ab6014b282ef65b658db70531188c326519564e34256c78971bcc407 SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}" WEB_SITE="https://github.com/jgarzik/cpuminer" LICENSE[0]=GPL diff --git a/net/cpuminer/HISTORY b/net/cpuminer/HISTORY index 5052be941e..210e8604b0 100644 --- a/net/cpuminer/HISTORY +++ b/net/cpuminer/HISTORY @@ -1,3 +1,6 @@ +2013-11-24 Ismael Luceno <ismael@sourcemage.org> + * DETAILS: Switched to pooler's fork, version 2.3.2 + 2011-05-26 Ismael Luceno <ismael@sourcemage.org> * DEPENDS, DETAILS: spell created diff --git a/net/iptables/DETAILS b/net/iptables/DETAILS index 26a92ab1dc..a9f9079694 100755 --- a/net/iptables/DETAILS +++ b/net/iptables/DETAILS @@ -1,5 +1,5 @@ SPELL=iptables - VERSION=1.4.19.1 + VERSION=1.4.21 SOURCE=$SPELL-$VERSION.tar.bz2 SOURCE2=$SOURCE.sig SOURCE_URL[0]=http://www.iptables.org/projects/$SPELL/files/$SOURCE diff --git a/net/iptables/HISTORY b/net/iptables/HISTORY index 732d3f1c8c..e2e9879206 100644 --- a/net/iptables/HISTORY +++ b/net/iptables/HISTORY @@ -1,3 +1,6 @@ +2013-11-29 Ladislav Hagara <hgr@vabo.cz> + * DETAILS: 1.4.21 + 2013-06-21 Remko van der Vossen <wich@sourcemage.org> * DETAILS: 1.4.19.1 diff --git a/net/libpcap/DETAILS b/net/libpcap/DETAILS index 9f72ed6f24..20dc0c3cd2 100755 --- a/net/libpcap/DETAILS +++ b/net/libpcap/DETAILS @@ -1,5 +1,5 @@ SPELL=libpcap - VERSION=1.4.0 + VERSION=1.5.1 SOURCE=$SPELL-$VERSION.tar.gz SOURCE2=$SOURCE.sig SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION" diff --git a/net/libpcap/HISTORY b/net/libpcap/HISTORY index 3dd7d46e0e..cf190b332b 100644 --- a/net/libpcap/HISTORY +++ b/net/libpcap/HISTORY @@ -1,3 +1,6 @@ +2013-11-28 Ladislav Hagara <hgr@vabo.cz> + * DETAILS: 1.5.1 + 2013-08-06 Treeve Jelbert <treeve@sourcemage.org> * DETAILS: version 1.4.0 * PRE_BUILD, libnl-3.patch: deleted diff --git a/net/samba4/DEPENDS b/net/samba4/DEPENDS index 8fabf65399..762377a73b 100755 --- a/net/samba4/DEPENDS +++ b/net/samba4/DEPENDS @@ -69,8 +69,8 @@ optional_depends avahi \ "for avahi support" && optional_depends sendfile \ - "--enable-sendfile-support" \ - "--disable-sendfile-support" \ + "--with-sendfile-support" \ + "--without-sendfile-support" \ "for sendfile support" && optional_depends libaio \ diff --git a/net/samba4/HISTORY b/net/samba4/HISTORY index cafdd0b083..ed1d789340 100644 --- a/net/samba4/HISTORY +++ b/net/samba4/HISTORY @@ -1,3 +1,7 @@ +2013-11-23 Eric Sandall <sandalle@sourcemage.org> + * PRE_BUILD: Fixed stable to just use default_pre_build, the other way leaves no files + * DEPENDS: Fixed --with-sendfile-support syntax + 2013-02-08 Sukneet Basuta <sukneet@sourcemage.org> * DETAILS: stable => 4.0.2 updated SOURCE_URLs diff --git a/net/samba4/PRE_BUILD b/net/samba4/PRE_BUILD index ee39da5dc7..96783b61d2 100755 --- a/net/samba4/PRE_BUILD +++ b/net/samba4/PRE_BUILD @@ -1,13 +1,5 @@ if [[ "$SAMBA4_BRANCH" != "scm" ]]; then - message "${MESSAGE_COLOR}gunzip $SOURCE_CACHE/$SOURCE${DEFAULT_COLOR}" - SOURCE_ORI=${SOURCE} - SOURCE=${SOURCE/.gz} - gunzip -c ${SOURCE_CACHE}/$SOURCE_ORI > $SOURCE default_pre_build - message "${MESSAGE_COLOR}rm $SOURCE${DEFAULT_COLOR}" - rm $SOURCE - SOURCE=${SOURCE_ORI} - else default_pre_build && cd $SOURCE_DIRECTORY/source4 && diff --git a/net/tcpdump/DETAILS b/net/tcpdump/DETAILS index b488d15e23..058c57e4f1 100755 --- a/net/tcpdump/DETAILS +++ b/net/tcpdump/DETAILS @@ -1,5 +1,5 @@ SPELL=tcpdump - VERSION=4.4.0 + VERSION=4.5.1 SOURCE=$SPELL-$VERSION.tar.gz SOURCE2=$SOURCE.sig SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION" diff --git a/net/tcpdump/HISTORY b/net/tcpdump/HISTORY index a7b446c176..ecf8cde5c1 100644 --- a/net/tcpdump/HISTORY +++ b/net/tcpdump/HISTORY @@ -1,3 +1,6 @@ +2013-11-28 Ladislav Hagara <hgr@vabo.cz> + * DETAILS: 4.5.1 + 2013-08-07 Ladislav Hagara <hgr@vabo.cz> * DETAILS: 4.4.0 diff --git a/printer/glabels/DEPENDS b/printer/glabels/DEPENDS index d6dd79b6ee..7629df3359 100755 --- a/printer/glabels/DEPENDS +++ b/printer/glabels/DEPENDS @@ -1,20 +1,38 @@ -depends intltool && -depends glib2 && -depends pkgconfig && -depends gtk+2 && -depends libxml2 && -depends libglade2 && -depends libgnomeui && -depends libgnome && -depends shared-mime-info && -depends desktop-file-utils && +depends pkgconfig && +depends glib2 && +depends pango && +depends cairo && +depends gtk+3 && +depends libxml2 && +depends librsvg2 && optional_depends gtk-doc \ "--enable-gtk-doc" \ "--disable-gtk-doc" \ "to build documentation" && +optional_depends barcode \ + "--with-libbarcode" \ + "--without-libbarcode" \ + "for GNU Barcode support" && + +optional_depends zint \ + "--with-libzint" \ + "--without-libzint" \ + "for Zint Barcode support" && + +optional_depends libqrencode \ + "--with-libqrencode" \ + "--without-libqrencode" \ + "for QR code support" && + +optional_depends iec16022 \ + "--with-libiec16022" \ + "--without-libiec16022" \ + "for IEC 16022 support" && + optional_depends evolution-data-server \ "--with-libebook" \ "--without-libebook" \ - "for Evolution Data Server support" + "for Evolution Data Server support" + diff --git a/printer/glabels/DETAILS b/printer/glabels/DETAILS index b3cbe81e2a..0e4d2f3931 100755 --- a/printer/glabels/DETAILS +++ b/printer/glabels/DETAILS @@ -1,10 +1,10 @@ SPELL=glabels - VERSION=2.2.8 + VERSION=3.2.0 BRANCH=${VERSION:0:3} - SOURCE=$SPELL-$VERSION.tar.gz + SOURCE=$SPELL-$VERSION.tar.xz SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION SOURCE_URL[0]=$GNOME_URL/sources/$SPELL/$BRANCH/$SOURCE - SOURCE_GPG="gurus.gpg:${SOURCE}.sig:UPSTREAM_HASH" + SOURCE_HASH=sha512:67faab8eb9f4128b532bce55a9fab34462c008d0990ba87e4d555359bec1bb162489d4bdf5efbb86c4fcfc708c92da4d88a91dd2a85f0989c9133af6b011c3ff WEB_SITE=http://www.glabels.org/ LICENSE[0]=GPL ENTERED=20070512 diff --git a/printer/glabels/HISTORY b/printer/glabels/HISTORY index 91295b54ad..44b5cdbe61 100644 --- a/printer/glabels/HISTORY +++ b/printer/glabels/HISTORY @@ -1,3 +1,7 @@ +2013-11-17 Robin Cook <rcook@wyrms.net> + * DETAILS: updated to 3.2.0 + * DEPENDS: updated depends + 2010-04-22 Vasil Yonkov <spirtbrat@sourcemage.org> * DEPENDS: added intltool, added optional gtk-doc, evolution-data-server diff --git a/printer/glabels/glabels-2.2.8.tar.gz.sig b/printer/glabels/glabels-2.2.8.tar.gz.sig Binary files differdeleted file mode 100644 index e2ae253d43..0000000000 --- a/printer/glabels/glabels-2.2.8.tar.gz.sig +++ /dev/null diff --git a/python-pypi/PY_DEPENDS b/python-pypi/PY_DEPENDS index f20cfb3e7a..540295f7c2 100755 --- a/python-pypi/PY_DEPENDS +++ b/python-pypi/PY_DEPENDS @@ -1,5 +1,2 @@ depends PYTHON && -# distutils is now included with python3 -if is_depends_enabled $SPELL python; then - depends setuptools -fi +depends setuptools diff --git a/python-pypi/babel/DEPENDS b/python-pypi/babel/DEPENDS index 503782e3b0..48d8ddc44d 100755 --- a/python-pypi/babel/DEPENDS +++ b/python-pypi/babel/DEPENDS @@ -1,2 +1 @@ -depends python && -depends SETUPTOOLS +. $SECTION_DIRECTORY/PY_DEPENDS diff --git a/python-pypi/babel/DETAILS b/python-pypi/babel/DETAILS index 144511c3f5..c2df2586bc 100755 --- a/python-pypi/babel/DETAILS +++ b/python-pypi/babel/DETAILS @@ -1,11 +1,11 @@ SPELL=babel SPELLX=Babel - VERSION=0.9.6 - SOURCE_HASH=sha512:65a93a405f8734dba5e36bac62e574633214660667ba5b2a8c1120924a93fed84a2a5087127d20bd33e98fbd8400bb7634f56b27d5f6db574c81ee5fe10ee537 + VERSION=1.3 + SOURCE_HASH=sha512:3173d578c36d7a20d14ffcf6406ec9fe301e71a199069b3d2e53bd0c66e7f83d6e94f071dc08f2708202ec1ace4d14f4476234cc8347a37b05317302f0cfe0cf SOURCE=$SPELLX-$VERSION.tar.gz - SOURCE_URL[0]=http://ftp.edgewall.com/pub/$SPELL/$SOURCE + SOURCE_URL[0]=http://pypi.python.org/packages/source/B/$SPELLX/$SOURCE SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELLX-$VERSION" - WEB_SITE=http://babel.edgewall.org/ + WEB_SITE=http://babel.pocoo.org/ LICENSE[0]=BSD SHORT="tools for internationalizing Python applications" cat << EOF diff --git a/python-pypi/babel/HISTORY b/python-pypi/babel/HISTORY index cfe8f757e4..2320aca7fd 100644 --- a/python-pypi/babel/HISTORY +++ b/python-pypi/babel/HISTORY @@ -1,3 +1,7 @@ +2013-11-20 Treeve Jelbert <treeve@sourcemage.org> + * DETAILS: version 1.3, new website & url + * DEPENDS: PYTHON + 2011-05-23 Sukneet Basuta <sukneet@sourcemage.org> * DEPENDS: updated setuptools dependency to SETUPTOOLS provider diff --git a/python-pypi/chardet/DEPENDS b/python-pypi/chardet/DEPENDS index a86d429d69..178a7f504d 100755 --- a/python-pypi/chardet/DEPENDS +++ b/python-pypi/chardet/DEPENDS @@ -1 +1,2 @@ -depends python +. $SECTION_DIRECTORY/PY_DEPENDS + diff --git a/python-pypi/chardet/HISTORY b/python-pypi/chardet/HISTORY index a4a9724357..8df6fc67bc 100644 --- a/python-pypi/chardet/HISTORY +++ b/python-pypi/chardet/HISTORY @@ -1,3 +1,6 @@ +2013-11-20 Treeve Jelbert <treeve@sourcemage.org> + * DEPENDS: PYTHON + 2013-02-13 Treeve Jelbert <treeve@sourcemage.org> * DETAILS: version 2.1.1 new website & url diff --git a/python-pypi/numpy/DETAILS b/python-pypi/numpy/DETAILS index 46d2a3f2f4..1e3aa37a6c 100755 --- a/python-pypi/numpy/DETAILS +++ b/python-pypi/numpy/DETAILS @@ -1,6 +1,6 @@ SPELL=numpy - VERSION=1.7.1 - SOURCE_HASH=sha512:d58177f3971b6d07baf6f81a2088ba371c7e43ea64ee7ada261da97c6d725b4bd4927122ac373c55383254e4e31691939276dab08a79a238bfa55172a3eff684 + VERSION=1.8.0 + SOURCE_HASH=sha512:ec3d002ed786335e8748983261c96f88a9f1520fc345ad5b810dc02a5e126e15fe5afb02bed1f4b43d580a1da39583d86b84f57dc456b0702653e34e5357c857 SOURCE=$SPELL-$VERSION.tar.gz SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION" SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE diff --git a/python-pypi/numpy/HISTORY b/python-pypi/numpy/HISTORY index d380e0148a..527ac2521a 100644 --- a/python-pypi/numpy/HISTORY +++ b/python-pypi/numpy/HISTORY @@ -1,3 +1,6 @@ +2013-11-20 Treeve Jelbert <treeve@sourcemage.org> + * DETAILS: version 1.8.0 + 2013-04-16 Treeve Jelbert <treeve@sourcemage.org> * DETAILS: version 1.7.1 * DEPENDS: fix python3 usage diff --git a/python-pypi/pybindgen/DEPENDS b/python-pypi/pybindgen/DEPENDS index 3e784640d8..1de373d0b2 100755 --- a/python-pypi/pybindgen/DEPENDS +++ b/python-pypi/pybindgen/DEPENDS @@ -1,3 +1,3 @@ -depends python && +. $SECTION_DIRECTORY/PY_DEPENDS depends gccxml && optional_depends pygccxml '' '' 'describe API in Python terms' diff --git a/python-pypi/pybindgen/HISTORY b/python-pypi/pybindgen/HISTORY index cd1361ad07..f0812944fb 100644 --- a/python-pypi/pybindgen/HISTORY +++ b/python-pypi/pybindgen/HISTORY @@ -1,3 +1,6 @@ +2013-11-20 Treeve Jelbert <treeve@sourcemage.org> + * DEPENDS: PYTHON3 + 2013-06-28 Treeve Jelbert <treeve@sourcemage.org> * DETAILS: version 0.16.0 spell created diff --git a/python-pypi/pyopenssl/DEPENDS b/python-pypi/pyopenssl/DEPENDS index 96ce075c8a..a7039a1516 100755 --- a/python-pypi/pyopenssl/DEPENDS +++ b/python-pypi/pyopenssl/DEPENDS @@ -1,2 +1,2 @@ -depends python && +. $SECTION_DIRECTORY/PY_DEPENDS && depends openssl diff --git a/python-pypi/pyopenssl/HISTORY b/python-pypi/pyopenssl/HISTORY index 009fff67c6..7bc70d2424 100644 --- a/python-pypi/pyopenssl/HISTORY +++ b/python-pypi/pyopenssl/HISTORY @@ -1,3 +1,6 @@ +2013-11-20 Treeve Jelbert <treeve@sourcemage.org> + * DEPENDS: use PYTHON + 2013-09-26 Treeve Jelbert <treeve@sourcemage.org> * DETAILS: version 0.13.1 SECURITY_PATCH=1, fixes CVE-2013-4314 diff --git a/python-pypi/pyutil/DETAILS b/python-pypi/pyutil/DETAILS index 238c931dc5..7785349b21 100755 --- a/python-pypi/pyutil/DETAILS +++ b/python-pypi/pyutil/DETAILS @@ -1,6 +1,6 @@ SPELL=pyutil - VERSION=1.9.4 - SOURCE_HASH=sha512:78df200025b96bf410eeb7e364e84d627761cb85a0cbfba65dea8ac3db2231128017a6ddf74e0002208d774c96445508932406a2016cc78274269a74b2bfbcc4 + VERSION=1.9.7 + SOURCE_HASH=sha512:467de9eb6a4b085bfcc11e1bab318220d440bbb1fd665ec32c4edf274599e53cc450a5a06fcd015e966acd597d5fcfa1b389f639aa6b3d6b0009a8eec6b11946 SOURCE=$SPELL-$VERSION.tar.gz SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION WEB_SITE=http://pypi.python.org/pypi/$SPELL diff --git a/python-pypi/pyutil/HISTORY b/python-pypi/pyutil/HISTORY index 96c51599f8..972e280a82 100644 --- a/python-pypi/pyutil/HISTORY +++ b/python-pypi/pyutil/HISTORY @@ -1,3 +1,6 @@ +2013-11-20 Treeve Jelbert <treeve@sourcemage.org> + * DETAINS: version 1,9,7 + 2012-12-05 Treeve Jelbert <treeve@sourcemage.org> * DETAILS: version 1.9.4 diff --git a/python-pypi/setuptools/DETAILS b/python-pypi/setuptools/DETAILS index 2524078ef9..1040f9b6ba 100755 --- a/python-pypi/setuptools/DETAILS +++ b/python-pypi/setuptools/DETAILS @@ -1,6 +1,6 @@ SPELL=setuptools - VERSION=1.3.2 - SOURCE_HASH=sha512:fc4e19a4933730fbe2892092cee993414beebd5a42accb20597771469ebab453581ec330272a2d7a73e5934d1d2e3c656329b6bebf6f4330d3a55ff2adb6eb60 + VERSION=1.4.1 + SOURCE_HASH=sha512:434b3c336da78a5c653ed85768c14bf5acacb9a1b85a65df2195d435531457accc2a4efea87fcae574b10abca77ef612d26f73c854e02c8f9c3b6caae2c84e01 SOURCE=$SPELL-$VERSION.tar.gz SOURCE_URL[0]=http://pypi.python.org/packages/source/s/$SPELL/$SOURCE SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION" diff --git a/python-pypi/setuptools/HISTORY b/python-pypi/setuptools/HISTORY index cc8b8475d9..822d0cba88 100644 --- a/python-pypi/setuptools/HISTORY +++ b/python-pypi/setuptools/HISTORY @@ -1,3 +1,6 @@ +2013-11-24 Treeve Jelbert <treeve@sourcemage.org> + * DETAILS: version 1.4.1 + 2013-11-14 Treeve Jelbert <treeve@sourcemage.org> * DETAILS: version 1.3.2 diff --git a/python-pypi/tempita/DEPENDS b/python-pypi/tempita/DEPENDS index 84a0acc92a..48d8ddc44d 100755 --- a/python-pypi/tempita/DEPENDS +++ b/python-pypi/tempita/DEPENDS @@ -1,2 +1 @@ -depends python && -depends SETUPTOOLS +. $SECTION_DIRECTORY/PY_DEPENDS diff --git a/python-pypi/tempita/HISTORY b/python-pypi/tempita/HISTORY index aa245c4bc4..5b8faf8d8b 100644 --- a/python-pypi/tempita/HISTORY +++ b/python-pypi/tempita/HISTORY @@ -1,3 +1,6 @@ +2013-11-20 Treeve Jelbert <treeve@sourcemage.org> + * DEPENDS: PYTHON + 2011-12-09 Treeve Jelbert <treeve@sourcemage.org> * DETAILS: version 0.5.1 diff --git a/python-pypi/viridian/DEPENDS b/python-pypi/viridian/DEPENDS new file mode 100755 index 0000000000..305752f31f --- /dev/null +++ b/python-pypi/viridian/DEPENDS @@ -0,0 +1,8 @@ +depends PYTHON && +depends pysqlite && +depends libsoup && +depends gst-python && +depends gst-plugins-good && +depends gst-plugins-ugly && + +optional_depends notify-python "" "" "for notifications" diff --git a/python-pypi/viridian/DETAILS b/python-pypi/viridian/DETAILS new file mode 100755 index 0000000000..2b96d0ef87 --- /dev/null +++ b/python-pypi/viridian/DETAILS @@ -0,0 +1,15 @@ + SPELL=viridian + VERSION=1.2 + SOURCE="Viridian-${VERSION}.tar.gz" + SOURCE_URL[0]=https://launchpad.net/${SPELL}player/trunk/${VERSION}-release/+download/${SOURCE} + SOURCE_HASH=sha512:fe36b00ba858754def603e4567310dd79db42c1950d2bd517cab20e09dba389dac943a9dd6af5f5267315cb2df8b4c344493a9796a85828db8682e31632a3c3d +SOURCE_DIRECTORY="${BUILD_DIRECTORY}/Viridian-${VERSION}" + WEB_SITE="http://viridian.daveeddy.com/" + LICENSE[0]=GPL + ENTERED=20131124 + SHORT="ampache client in python" +cat << EOF +Viridian is an Ampache Client that displays all of your media from your +Ampache server in a simple and convenient way that makes choosing and +streaming music an easy task. +EOF diff --git a/python-pypi/viridian/HISTORY b/python-pypi/viridian/HISTORY new file mode 100644 index 0000000000..2175e2440b --- /dev/null +++ b/python-pypi/viridian/HISTORY @@ -0,0 +1,6 @@ +2013-11-25 Jeremy Blosser <jblosser@sourcemage.org> + * DEPENDS: libsoup, gst-plugins-good, pysqlite + +2013-11-24 Jeremy Blosser <jblosser@sourcemage.org> + * DEPENDS, DETAILS: spell created + diff --git a/python-pypi/webhelpers/DEPENDS b/python-pypi/webhelpers/DEPENDS index 02a0f5e6ff..9af9ef8f8b 100755 --- a/python-pypi/webhelpers/DEPENDS +++ b/python-pypi/webhelpers/DEPENDS @@ -1,3 +1,2 @@ -depends python && -depends SETUPTOOLS && +. $SECTION_DIRECTORY/PY_DEPENDS depends markupsafe diff --git a/python-pypi/webhelpers/HISTORY b/python-pypi/webhelpers/HISTORY index 6da693c70e..9a83b0d8c1 100644 --- a/python-pypi/webhelpers/HISTORY +++ b/python-pypi/webhelpers/HISTORY @@ -1,3 +1,6 @@ +2013-11-20 Treeve Jelbert <treeve@sourcemage.org> + * DEPENDS: PYTHON + 2012-02-27 Treeve Jelbert <treeve@sourcemage.org> * DETAILS: version 1.3 diff --git a/python-pypi/webob/DEPENDS b/python-pypi/webob/DEPENDS index 84a0acc92a..48d8ddc44d 100755 --- a/python-pypi/webob/DEPENDS +++ b/python-pypi/webob/DEPENDS @@ -1,2 +1 @@ -depends python && -depends SETUPTOOLS +. $SECTION_DIRECTORY/PY_DEPENDS diff --git a/python-pypi/webob/HISTORY b/python-pypi/webob/HISTORY index c79aef19ef..f62bba0f6e 100644 --- a/python-pypi/webob/HISTORY +++ b/python-pypi/webob/HISTORY @@ -1,3 +1,6 @@ +2013-11-20 Treeve Jelbert <treeve@sourcemage.org> + * DEPENDS: PYTHON + 2012-12-05 Treeve Jelbert <treeve@sourcemage.org> * DETAILS: version 1.2.3 diff --git a/python-pypi/xlwt/DETAILS b/python-pypi/xlwt/DETAILS index e4cfda39e9..c63e245d5a 100755 --- a/python-pypi/xlwt/DETAILS +++ b/python-pypi/xlwt/DETAILS @@ -1,10 +1,11 @@ SPELL=xlwt - VERSION=0.7.5 - SOURCE_HASH=sha512:d385c36c80002998891dd93d4ebcdd962239463ee089965961d3b8955d4783bbcdec96920891a252ee6cb076eab6b13ffad83e7758c179dcbc684e82fa8dfe35 - SOURCE=$SPELL-$VERSION.tar.gz -SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION - WEB_SITE=http://pypi.python.org/pypi/xlwt - SOURCE_URL[0]=http://pypi.python.org/packages/source/x/$SPELL/$SOURCE + SPELLX=xlwt-future + VERSION=0.8.0 + SOURCE_HASH=sha512:2414c260e8be25cb288a02ee252b97372e1556aaddd191290c85f037094ee5222849a43cc032e9af54aa1f524e3a33a51b6d528d861343775db498ffb6bcb07e + SOURCE=$SPELLX-$VERSION.tar.gz +SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-$VERSION + WEB_SITE=http://pypi.python.org/pypi/$SPELLx + SOURCE_URL[0]=http://pypi.python.org/packages/source/x/$SPELLX/$SOURCE LICENSE[0]=BSD ENTERED=20090930 KEYWORDS="python " diff --git a/python-pypi/xlwt/HISTORY b/python-pypi/xlwt/HISTORY index bc33c946ba..b6de5a51eb 100644 --- a/python-pypi/xlwt/HISTORY +++ b/python-pypi/xlwt/HISTORY @@ -1,3 +1,7 @@ +2013-11-24 Treeve Jelbert <treeve@sourcemage.org> + * DETAILS: version 0.8.0 + use xlwt-future + 2013-04-16 Treeve Jelbert <treeve@sourcemage.org> * DETAILS: version 0.7.5 * DEPENDS: fix python3 usage diff --git a/science/xaos/DETAILS b/science/xaos/DETAILS index 14400a574d..2335c87831 100755 --- a/science/xaos/DETAILS +++ b/science/xaos/DETAILS @@ -1,10 +1,10 @@ SPELL=xaos - VERSION=3.5 + VERSION=3.6 SOURCE=xaos-$VERSION.tar.gz SOURCE_DIRECTORY=$BUILD_DIRECTORY/xaos-$VERSION SOURCE_URL[0]=$SOURCEFORGE_URL/xaos/$SOURCE WEB_SITE=http://xaos.sourceforge.net/ - SOURCE_HASH=sha512:c0d9e88de7767a9c62bf2fe6e49e4115d992882cd0780acf61fc14539364d383b275b7f589de353e0b025f43efc54986f19c0722322aedd992027e788295d1df + SOURCE_HASH=sha512:5f61df978b7842b84a52cfb28f7daf1a5ab11d9d7adadbd0dd5bfb60240fcb2fc59b2a3d34faff7896c0c44c32daaf3941071d70db3d58b06b1aef1bcd1022c1 LICENSE[0]=GPL ENTERED=20020821 KEYWORDS="science" diff --git a/science/xaos/HISTORY b/science/xaos/HISTORY index 3300874175..1c6508fa07 100644 --- a/science/xaos/HISTORY +++ b/science/xaos/HISTORY @@ -1,3 +1,6 @@ +2013-11-19 Ladislav Hagara <hgr@vabo.cz> + * DETAILS: 3.6 + 2009-07-20 Ladislav Hagara <hgr@vabo.cz> * DETAILS: 3.5, XaoS -> xaos, fixed SHORT diff --git a/shell-term-fm/rdesktop/DETAILS b/shell-term-fm/rdesktop/DETAILS index 3c753a3588..5068cc7f15 100755 --- a/shell-term-fm/rdesktop/DETAILS +++ b/shell-term-fm/rdesktop/DETAILS @@ -1,10 +1,10 @@ SPELL=rdesktop - VERSION=1.7.1 + VERSION=1.8.1 SECURITY_PATCH=2 SOURCE=$SPELL-$VERSION.tar.gz SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION SOURCE_URL[0]=http://sourceforge.net/projects/$SPELL/files/$SPELL/$VERSION/$SOURCE/download - SOURCE_HASH=sha512:aaefbcda77a333ec065e42aa20e5335e48c51858dab860495528b399696c0ed6594ab9c5234716682e7ebef81d36cc6d157eedae700e0df209da9034d04887fc + SOURCE_HASH=sha512:31f13bf644ef16939a8c6c12709b89f59b0de276cc113c5e43ba505c5a352f515fdd1302c32f3095caca66796c9a15d574374391b4a67745fa505512499ed071 WEB_SITE=http://www.rdesktop.org ENTERED=20010922 LICENSE[0]=GPL3 diff --git a/shell-term-fm/rdesktop/HISTORY b/shell-term-fm/rdesktop/HISTORY index 06d59f674f..a4a1401095 100644 --- a/shell-term-fm/rdesktop/HISTORY +++ b/shell-term-fm/rdesktop/HISTORY @@ -1,3 +1,6 @@ +2013-11-20 Ladislav Hagara <hgr@vabo.cz> + * DETAILS: 1.8.1 + 2013-06-24 Remko van der Vossen <wich@sourcemage.org> * DETAILS: Proper download link diff --git a/shell-term-fm/st/DEPENDS b/shell-term-fm/st/DEPENDS index b555ae0d45..b3289e2d04 100755 --- a/shell-term-fm/st/DEPENDS +++ b/shell-term-fm/st/DEPENDS @@ -1 +1,5 @@ -depends libx11 +depends libx11 && +depends libxext && +depends libxft && +depends fontconfig && +depends freetype2 diff --git a/shell-term-fm/st/HISTORY b/shell-term-fm/st/HISTORY index 377fc27fb2..2b119a34eb 100644 --- a/shell-term-fm/st/HISTORY +++ b/shell-term-fm/st/HISTORY @@ -1,3 +1,6 @@ +2013-11-21 Ismael Luceno <ismael@sourcemage.org> + * DEPENDS: Add missing dependencies + 2013-05-18 Ladislav Hagara <hgr@vabo.cz> * DETAILS: 0.4.1 diff --git a/shell-term-fm/xfe/DETAILS b/shell-term-fm/xfe/DETAILS index 3c761e8bad..641bf85404 100755 --- a/shell-term-fm/xfe/DETAILS +++ b/shell-term-fm/xfe/DETAILS @@ -1,6 +1,6 @@ SPELL=xfe - VERSION=1.35 - SOURCE_HASH=sha512:92d764a266e3f2e44ab1a8c1f6a8869ba8d32180520c40205829e0a46cc2dd553917efa385c61b9e10d53ffb7435dd635d62e238c9c89c054dbfd60741fc0623 + VERSION=1.37 + SOURCE_HASH=sha512:32b4c7a4cba09504915735802a3adb1f4508920effb140e710911c5ae4663d1dcacfbedfc78f35473a2f40478c1a85f79865c1b6e3ede88ed193c1092d3e09e2 SOURCE=$SPELL-$VERSION.tar.gz SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE diff --git a/shell-term-fm/xfe/HISTORY b/shell-term-fm/xfe/HISTORY index 866de55fc1..09e464b66e 100644 --- a/shell-term-fm/xfe/HISTORY +++ b/shell-term-fm/xfe/HISTORY @@ -1,3 +1,6 @@ +2013-11-26 Vlad Glagolev <stealth@sourcemage.org> + * DETAILS: updated spell to 1.37 + 2013-09-10 Vlad Glagolev <stealth@sourcemage.org> * DETAILS: updated spell to 1.35 diff --git a/utils/barcode/DETAILS b/utils/barcode/DETAILS index 91ee0e62e1..8476cc4a3b 100755 --- a/utils/barcode/DETAILS +++ b/utils/barcode/DETAILS @@ -1,12 +1,11 @@ SPELL=barcode - VERSION=0.98 - SOURCE=$SPELL-$VERSION.tar.gz + VERSION=0.99 + SOURCE=$SPELL-$VERSION.tar.xz SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION SOURCE_URL[0]=$GNU_URL/$SPELL/$SOURCE - SOURCE_HASH=sha512:b2ff43d0c752a9fe7c17d65ef136ff2432ceddd27879c91cb18e46e9b0fc8ed6c174aa4154c0fa6d6e70c478ac86448b8eafa1857bb759159b2eaecc8d6f7ca1 + SOURCE_HASH=sha512:1f3015ee9cb2e57e38e56fa48fa3a38fa355821801bad3132d3e87b5b88db4f167986c33dc044317cbf18bb62062af36e946daab98235ff7015a00937c8dd41e WEB_SITE=http://ar.linux.it/software/#barcode ENTERED=20040425 - UPDATED=20050209 LICENSE[0]=GPL KEYWORDS="utils" SHORT="GNU Barcode creator" diff --git a/utils/barcode/HISTORY b/utils/barcode/HISTORY index 31f97ecfca..86284dfbfc 100644 --- a/utils/barcode/HISTORY +++ b/utils/barcode/HISTORY @@ -1,3 +1,6 @@ +2013-11-17 Robin Cook <rcook@wyrms.net> + * DETAILS: updated VERSION to 0.99 + 2006-06-28 Eric Sandall <sandalle@sourcemage.org> * DETAILS: Removed BUILD_API=2, set grimoire-wide diff --git a/utils/dmenu/CONFIGURE b/utils/dmenu/CONFIGURE new file mode 100755 index 0000000000..854ac4c0b4 --- /dev/null +++ b/utils/dmenu/CONFIGURE @@ -0,0 +1 @@ +config_query DMENU_XFT "Apply patch for Xft fonts?" y diff --git a/utils/dmenu/DEPENDS b/utils/dmenu/DEPENDS index ecf9480433..87d86f4d59 100755 --- a/utils/dmenu/DEPENDS +++ b/utils/dmenu/DEPENDS @@ -1,2 +1,9 @@ depends libxinerama && -depends X11-LIBS +depends X11-LIBS && +if [[ $DMENU_XFT = y ]]; then + depends freetype2 && + depends fontconfig && + depends libxrender && + depends libxft && + depends zlib +fi diff --git a/utils/dmenu/HISTORY b/utils/dmenu/HISTORY index 2956f34fe7..6028341861 100644 --- a/utils/dmenu/HISTORY +++ b/utils/dmenu/HISTORY @@ -1,3 +1,6 @@ +2013-11-26 Ismael Luceno <ismael@sourcemage.org> + * CONFIGURE, DEPENDS, PRE_BUILD, dmenu-4.5-xft.diff: Xft fonts support + 2012-12-25 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de> * DETAILS: version 4.5 diff --git a/utils/dmenu/PRE_BUILD b/utils/dmenu/PRE_BUILD index 0e5e62cba0..bbb567b5c8 100755 --- a/utils/dmenu/PRE_BUILD +++ b/utils/dmenu/PRE_BUILD @@ -7,4 +7,7 @@ sedit "s/\${PREFIX}\/etc/${INSTALL_ROOT}\/etc/" config.mk && sedit "s:^CXXFLAGS \+=:CXXFLAGS = ${CXXFLAGS} :" config.mk && sedit "s:^CFLAGS \+=:CFLAGS = ${CFLAGS} :" config.mk && -sedit "s:^LDFLAGS \+=:LDFLAGS = ${LDFLAGS} :" config.mk +sedit "s:^LDFLAGS \+=:LDFLAGS = ${LDFLAGS} :" config.mk && +if [[ $DMENU_XFT = y ]]; then + patch -p1 < $SPELL_DIRECTORY/dmenu-4.5-xft.diff +fi diff --git a/utils/dmenu/dmenu-4.5-xft.diff b/utils/dmenu/dmenu-4.5-xft.diff new file mode 100644 index 0000000000..ff93337ca2 --- /dev/null +++ b/utils/dmenu/dmenu-4.5-xft.diff @@ -0,0 +1,418 @@ +diff -upr a/config.mk b/config.mk +--- a/config.mk 2012-01-10 19:03:22.000000000 +0200 ++++ b/config.mk 2012-01-10 19:03:38.000000000 +0200 +@@ -12,9 +12,13 @@ X11LIB = /usr/X11R6/lib + XINERAMALIBS = -lXinerama + XINERAMAFLAGS = -DXINERAMA + ++# Xft, comment if you don't want it ++XFTINC = -I/usr/include/freetype2 ++XFTLIBS = -lXft -lXrender -lfreetype -lz -lfontconfig ++ + # includes and libs +-INCS = -I${X11INC} +-LIBS = -L${X11LIB} -lX11 ${XINERAMALIBS} ++INCS = -I${X11INC} ${XFTINC} ++LIBS = -L${X11LIB} -lX11 ${XINERAMALIBS} ${XFTLIBS} + + # flags + CPPFLAGS = -D_BSD_SOURCE -D_POSIX_C_SOURCE=2 -DVERSION=\"${VERSION}\" ${XINERAMAFLAGS} +diff -upr a/dmenu.1 b/dmenu.1 +--- a/dmenu.1 2012-01-10 19:14:19.000000000 +0200 ++++ b/dmenu.1 2012-01-10 19:14:23.000000000 +0200 +@@ -53,7 +53,7 @@ dmenu lists items vertically, with the g + defines the prompt to be displayed to the left of the input field. + .TP + .BI \-fn " font" +-defines the font or font set used. ++defines the font or font set used. eg. "fixed" or "Monospace-12:normal" (an xft font) + .TP + .BI \-nb " color" + defines the normal background color. +diff -upr a/dmenu.c b/dmenu.c +--- a/dmenu.c 2012-01-10 19:14:19.000000000 +0200 ++++ b/dmenu.c 2012-01-10 19:24:39.000000000 +0200 +@@ -17,6 +17,7 @@ + * MAX(0, MIN((y)+(h),(r).y_org+(r).height) - MAX((y),(r).y_org))) + #define MIN(a,b) ((a) < (b) ? (a) : (b)) + #define MAX(a,b) ((a) > (b) ? (a) : (b)) ++#define DEFFONT "fixed" /* xft example: "Monospace-11" */ + + typedef struct Item Item; + struct Item { +@@ -26,6 +27,7 @@ struct Item { + + static void appenditem(Item *item, Item **list, Item **last); + static void calcoffsets(void); ++static void cleanup(void); + static char *cistrstr(const char *s, const char *sub); + static void drawmenu(void); + static void grabkeyboard(void); +@@ -50,10 +52,12 @@ static const char *normfgcolor = "#bbbbb + static const char *selbgcolor = "#005577"; + static const char *selfgcolor = "#eeeeee"; + static unsigned int lines = 0; +-static unsigned long normcol[ColLast]; +-static unsigned long selcol[ColLast]; ++static ColorSet *normcol; ++static ColorSet *selcol; + static Atom clip, utf8; + static Bool topbar = True; ++static Bool running = True; ++static int ret = 0; + static DC *dc; + static Item *items = NULL; + static Item *matches, *matchend; +@@ -104,7 +108,9 @@ main(int argc, char *argv[]) { + usage(); + + dc = initdc(); +- initfont(dc, font); ++ initfont(dc, font ? font : DEFFONT); ++ normcol = initcolor(dc, normfgcolor, normbgcolor); ++ selcol = initcolor(dc, selfgcolor, selbgcolor); + + if(fast) { + grabkeyboard(); +@@ -117,7 +123,8 @@ main(int argc, char *argv[]) { + setup(); + run(); + +- return 1; /* unreachable */ ++ cleanup(); ++ return ret; + } + + void +@@ -160,6 +167,15 @@ cistrstr(const char *s, const char *sub) + } + + void ++cleanup(void) { ++ freecol(dc, normcol); ++ freecol(dc, selcol); ++ XDestroyWindow(dc->dpy, win); ++ XUngrabKeyboard(dc->dpy, CurrentTime); ++ freedc(dc); ++} ++ ++void + drawmenu(void) { + int curpos; + Item *item; +@@ -167,7 +183,7 @@ drawmenu(void) { + dc->x = 0; + dc->y = 0; + dc->h = bh; +- drawrect(dc, 0, 0, mw, mh, True, BG(dc, normcol)); ++ drawrect(dc, 0, 0, mw, mh, True, normcol->BG); + + if(prompt) { + dc->w = promptw; +@@ -178,7 +194,7 @@ drawmenu(void) { + dc->w = (lines > 0 || !matches) ? mw - dc->x : inputw; + drawtext(dc, text, normcol); + if((curpos = textnw(dc, text, cursor) + dc->h/2 - 2) < dc->w) +- drawrect(dc, curpos, 2, 1, dc->h - 4, True, FG(dc, normcol)); ++ drawrect(dc, curpos, 2, 1, dc->h - 4, True, normcol->FG); + + if(lines > 0) { + /* draw vertical list */ +@@ -321,7 +337,8 @@ keypress(XKeyEvent *ev) { + sel = matchend; + break; + case XK_Escape: +- exit(EXIT_FAILURE); ++ ret = EXIT_FAILURE; ++ running = False; + case XK_Home: + if(sel == matches) { + cursor = 0; +@@ -359,7 +376,8 @@ keypress(XKeyEvent *ev) { + case XK_Return: + case XK_KP_Enter: + puts((sel && !(ev->state & ShiftMask)) ? sel->text : text); +- exit(EXIT_SUCCESS); ++ ret = EXIT_SUCCESS; ++ running = False; + case XK_Right: + if(text[cursor] != '\0') { + cursor = nextrune(+1); +@@ -490,7 +508,7 @@ void + run(void) { + XEvent ev; + +- while(!XNextEvent(dc->dpy, &ev)) { ++ while(running && !XNextEvent(dc->dpy, &ev)) { + if(XFilterEvent(&ev, win)) + continue; + switch(ev.type) { +@@ -524,11 +542,6 @@ setup(void) { + XineramaScreenInfo *info; + #endif + +- normcol[ColBG] = getcolor(dc, normbgcolor); +- normcol[ColFG] = getcolor(dc, normfgcolor); +- selcol[ColBG] = getcolor(dc, selbgcolor); +- selcol[ColFG] = getcolor(dc, selfgcolor); +- + clip = XInternAtom(dc->dpy, "CLIPBOARD", False); + utf8 = XInternAtom(dc->dpy, "UTF8_STRING", False); + +@@ -582,7 +595,7 @@ setup(void) { + + /* create menu window */ + swa.override_redirect = True; +- swa.background_pixel = normcol[ColBG]; ++ swa.background_pixel = normcol->BG; + swa.event_mask = ExposureMask | KeyPressMask | VisibilityChangeMask; + win = XCreateWindow(dc->dpy, root, x, y, mw, mh, 0, + DefaultDepth(dc->dpy, screen), CopyFromParent, +diff -upr a/draw.c b/draw.c +--- a/draw.c 2012-01-10 19:14:19.000000000 +0200 ++++ b/draw.c 2012-01-10 19:14:23.000000000 +0200 +@@ -9,9 +9,6 @@ + + #define MAX(a, b) ((a) > (b) ? (a) : (b)) + #define MIN(a, b) ((a) < (b) ? (a) : (b)) +-#define DEFAULTFN "fixed" +- +-static Bool loadfont(DC *dc, const char *fontstr); + + void + drawrect(DC *dc, int x, int y, unsigned int w, unsigned int h, Bool fill, unsigned long color) { +@@ -23,7 +20,7 @@ drawrect(DC *dc, int x, int y, unsigned + } + + void +-drawtext(DC *dc, const char *text, unsigned long col[ColLast]) { ++drawtext(DC *dc, const char *text, ColorSet *col) { + char buf[BUFSIZ]; + size_t mn, n = strlen(text); + +@@ -35,19 +32,24 @@ drawtext(DC *dc, const char *text, unsig + if(mn < n) + for(n = MAX(mn-3, 0); n < mn; buf[n++] = '.'); + +- drawrect(dc, 0, 0, dc->w, dc->h, True, BG(dc, col)); ++ drawrect(dc, 0, 0, dc->w, dc->h, True, col->BG); + drawtextn(dc, buf, mn, col); + } + + void +-drawtextn(DC *dc, const char *text, size_t n, unsigned long col[ColLast]) { ++drawtextn(DC *dc, const char *text, size_t n, ColorSet *col) { + int x = dc->x + dc->font.height/2; + int y = dc->y + dc->font.ascent+1; + +- XSetForeground(dc->dpy, dc->gc, FG(dc, col)); +- if(dc->font.set) ++ XSetForeground(dc->dpy, dc->gc, col->FG); ++ if(dc->font.xft_font) { ++ if (!dc->xftdraw) ++ eprintf("error, xft drawable does not exist"); ++ XftDrawStringUtf8(dc->xftdraw, &col->FG_xft, ++ dc->font.xft_font, x, y, (unsigned char*)text, n); ++ } else if(dc->font.set) { + XmbDrawString(dc->dpy, dc->canvas, dc->font.set, dc->gc, x, y, text, n); +- else { ++ } else { + XSetFont(dc->dpy, dc->gc, dc->font.xfont->fid); + XDrawString(dc->dpy, dc->canvas, dc->gc, x, y, text, n); + } +@@ -69,16 +71,33 @@ eprintf(const char *fmt, ...) { + } + + void ++freecol(DC *dc, ColorSet *col) { ++ if(col) { ++ if(&col->FG_xft) ++ XftColorFree(dc->dpy, DefaultVisual(dc->dpy, DefaultScreen(dc->dpy)), ++ DefaultColormap(dc->dpy, DefaultScreen(dc->dpy)), &col->FG_xft); ++ free(col); ++ } ++} ++ ++void + freedc(DC *dc) { ++ if(dc->font.xft_font) { ++ XftFontClose(dc->dpy, dc->font.xft_font); ++ XftDrawDestroy(dc->xftdraw); ++ } + if(dc->font.set) + XFreeFontSet(dc->dpy, dc->font.set); +- if(dc->font.xfont) ++ if(dc->font.xfont) + XFreeFont(dc->dpy, dc->font.xfont); +- if(dc->canvas) ++ if(dc->canvas) + XFreePixmap(dc->dpy, dc->canvas); +- XFreeGC(dc->dpy, dc->gc); +- XCloseDisplay(dc->dpy); +- free(dc); ++ if(dc->gc) ++ XFreeGC(dc->dpy, dc->gc); ++ if(dc->dpy) ++ XCloseDisplay(dc->dpy); ++ if(dc) ++ free(dc); + } + + unsigned long +@@ -91,6 +110,20 @@ getcolor(DC *dc, const char *colstr) { + return color.pixel; + } + ++ColorSet * ++initcolor(DC *dc, const char * foreground, const char * background) { ++ ColorSet * col = (ColorSet *)malloc(sizeof(ColorSet)); ++ if(!col) ++ eprintf("error, cannot allocate memory for color set"); ++ col->BG = getcolor(dc, background); ++ col->FG = getcolor(dc, foreground); ++ if(dc->font.xft_font) ++ if(!XftColorAllocName(dc->dpy, DefaultVisual(dc->dpy, DefaultScreen(dc->dpy)), ++ DefaultColormap(dc->dpy, DefaultScreen(dc->dpy)), foreground, &col->FG_xft)) ++ eprintf("error, cannot allocate xft font color '%s'\n", foreground); ++ return col; ++} ++ + DC * + initdc(void) { + DC *dc; +@@ -109,39 +142,33 @@ initdc(void) { + + void + initfont(DC *dc, const char *fontstr) { +- if(!loadfont(dc, fontstr ? fontstr : DEFAULTFN)) { +- if(fontstr != NULL) +- fprintf(stderr, "cannot load font '%s'\n", fontstr); +- if(fontstr == NULL || !loadfont(dc, DEFAULTFN)) +- eprintf("cannot load font '%s'\n", DEFAULTFN); +- } +- dc->font.height = dc->font.ascent + dc->font.descent; +-} +- +-Bool +-loadfont(DC *dc, const char *fontstr) { + char *def, **missing, **names; + int i, n; + XFontStruct **xfonts; + +- if(!*fontstr) +- return False; +- if((dc->font.set = XCreateFontSet(dc->dpy, fontstr, &missing, &n, &def))) { ++ missing = NULL; ++ if((dc->font.xfont = XLoadQueryFont(dc->dpy, fontstr))) { ++ dc->font.ascent = dc->font.xfont->ascent; ++ dc->font.descent = dc->font.xfont->descent; ++ dc->font.width = dc->font.xfont->max_bounds.width; ++ } else if((dc->font.set = XCreateFontSet(dc->dpy, fontstr, &missing, &n, &def))) { + n = XFontsOfFontSet(dc->font.set, &xfonts, &names); + for(i = 0; i < n; i++) { + dc->font.ascent = MAX(dc->font.ascent, xfonts[i]->ascent); + dc->font.descent = MAX(dc->font.descent, xfonts[i]->descent); + dc->font.width = MAX(dc->font.width, xfonts[i]->max_bounds.width); + } +- } +- else if((dc->font.xfont = XLoadQueryFont(dc->dpy, fontstr))) { +- dc->font.ascent = dc->font.xfont->ascent; +- dc->font.descent = dc->font.xfont->descent; +- dc->font.width = dc->font.xfont->max_bounds.width; ++ } else if((dc->font.xft_font = XftFontOpenName(dc->dpy, DefaultScreen(dc->dpy), fontstr))) { ++ dc->font.ascent = dc->font.xft_font->ascent; ++ dc->font.descent = dc->font.xft_font->descent; ++ dc->font.width = dc->font.xft_font->max_advance_width; ++ } else { ++ eprintf("cannot load font '%s'\n", fontstr); + } + if(missing) + XFreeStringList(missing); +- return dc->font.set || dc->font.xfont; ++ dc->font.height = dc->font.ascent + dc->font.descent; ++ return; + } + + void +@@ -151,20 +178,29 @@ mapdc(DC *dc, Window win, unsigned int w + + void + resizedc(DC *dc, unsigned int w, unsigned int h) { ++ int screen = DefaultScreen(dc->dpy); + if(dc->canvas) + XFreePixmap(dc->dpy, dc->canvas); + + dc->w = w; + dc->h = h; + dc->canvas = XCreatePixmap(dc->dpy, DefaultRootWindow(dc->dpy), w, h, +- DefaultDepth(dc->dpy, DefaultScreen(dc->dpy))); ++ DefaultDepth(dc->dpy, screen)); ++ if(dc->font.xft_font && !(dc->xftdraw)) { ++ dc->xftdraw = XftDrawCreate(dc->dpy, dc->canvas, DefaultVisual(dc->dpy,screen), DefaultColormap(dc->dpy,screen)); ++ if(!(dc->xftdraw)) ++ eprintf("error, cannot create xft drawable\n"); ++ } + } + + int + textnw(DC *dc, const char *text, size_t len) { +- if(dc->font.set) { ++ if(dc->font.xft_font) { ++ XGlyphInfo gi; ++ XftTextExtentsUtf8(dc->dpy, dc->font.xft_font, (const FcChar8*)text, len, &gi); ++ return gi.width; ++ } else if(dc->font.set) { + XRectangle r; +- + XmbTextExtents(dc->font.set, text, len, NULL, &r); + return r.width; + } +diff -upr a/draw.h b/draw.h +--- a/draw.h 2012-01-10 19:14:19.000000000 +0200 ++++ b/draw.h 2012-01-10 19:14:23.000000000 +0200 +@@ -1,9 +1,6 @@ + /* See LICENSE file for copyright and license details. */ + +-#define FG(dc, col) ((col)[(dc)->invert ? ColBG : ColFG]) +-#define BG(dc, col) ((col)[(dc)->invert ? ColFG : ColBG]) +- +-enum { ColBG, ColFG, ColBorder, ColLast }; ++#include <X11/Xft/Xft.h> + + typedef struct { + int x, y, w, h; +@@ -11,6 +8,7 @@ typedef struct { + Display *dpy; + GC gc; + Pixmap canvas; ++ XftDraw *xftdraw; + struct { + int ascent; + int descent; +@@ -18,15 +16,24 @@ typedef struct { + int width; + XFontSet set; + XFontStruct *xfont; ++ XftFont *xft_font; + } font; + } DC; /* draw context */ + ++typedef struct { ++ unsigned long FG; ++ XftColor FG_xft; ++ unsigned long BG; ++} ColorSet; ++ + void drawrect(DC *dc, int x, int y, unsigned int w, unsigned int h, Bool fill, unsigned long color); +-void drawtext(DC *dc, const char *text, unsigned long col[ColLast]); +-void drawtextn(DC *dc, const char *text, size_t n, unsigned long col[ColLast]); ++void drawtext(DC *dc, const char *text, ColorSet *col); ++void drawtextn(DC *dc, const char *text, size_t n, ColorSet *col); ++void freecol(DC *dc, ColorSet *col); + void eprintf(const char *fmt, ...); + void freedc(DC *dc); + unsigned long getcolor(DC *dc, const char *colstr); ++ColorSet *initcolor(DC *dc, const char *foreground, const char *background); + DC *initdc(void); + void initfont(DC *dc, const char *fontstr); + void mapdc(DC *dc, Window win, unsigned int w, unsigned int h); diff --git a/utils/util-linux/BUILD b/utils/util-linux/BUILD index bdeb68032a..6d02712201 100755 --- a/utils/util-linux/BUILD +++ b/utils/util-linux/BUILD @@ -5,9 +5,16 @@ if [[ $CROSS_INSTALL == on ]]; then OPTS="--host=$HOST $OPTS" fi && -if [[ $UL_VERSION == latest ]]; then - OPTS="--disable-eject --disable-kill --disable-login --disable-sulogin --disable-su --disable-utmpdump $OPTS" -fi && +OPTS="--disable-eject \ + --disable-kill \ + --disable-last \ + --disable-login \ + --disable-mesg \ + --disable-nologin \ + --disable-su \ + --disable-sulogin \ + --disable-utmpdump \ + $OPTS" create_group tty && diff --git a/utils/util-linux/DEPENDS b/utils/util-linux/DEPENDS index 9e2bb66b88..2fb693af70 100755 --- a/utils/util-linux/DEPENDS +++ b/utils/util-linux/DEPENDS @@ -1,8 +1,15 @@ +. "$GRIMOIRE/FUNCTIONS" && + depends CONSOLE-TOOLS && depends e2fsprogs && depends gnupg && depends smgl-fhs && depends zlib && +depends automake && + +if spell_ok automake && is_version_less $(installed_version automake) 1.14; then + force_depends automake +fi && optional_depends nfs-utils '' '' 'for NFS mount support' && @@ -12,15 +19,25 @@ optional_depends libselinux \ 'for NSA Security Enhanced Linux' && optional_depends linux-pam \ - '--with-pam' \ - '--without-pam' \ - 'for Linux Pluggable Authentication Module support' && + "--enable-runuser" \ + "--disable-runuser" \ + "for Linux Pluggable Authentication Module support" && + +optional_depends libcap-ng \ + "--enable-setpriv" \ + "--disable-setpriv" \ + "to build setpriv" && optional_depends gettext \ "--enable-nls" \ "--disable-nls" \ "for Native Language Support" && +optional_depends PYTHON \ + "--with-python" \ + "--without-python" \ + "to generate Python bindings" && + # # NOTE: # --with-ncurses build with non-wide ncurses, default is wide version diff --git a/utils/util-linux/DETAILS b/utils/util-linux/DETAILS index f0cfd446ed..951c9df018 100755 --- a/utils/util-linux/DETAILS +++ b/utils/util-linux/DETAILS @@ -1,9 +1,9 @@ SPELL=util-linux if [[ $UL_VERSION == aes ]]; then - VERSION=2.20 + VERSION=2.24 SECURITY_PATCH=2 - SOURCE_HASH=sha512:d7ccd88410380a6226772bd7cecc9b04158db8813bee7216acb6d8861f7c2a1f2cddb552f0b4c0ca8dafcac3e11ae95ff4438d19aefa503d909ccfca04b5fa27 - SOURCE3=$SPELL-$VERSION-20110905.diff.bz2 + SOURCE_HASH=sha512:9e1945646a64420226e5af4546022ee604fdba89f91ee474b941075fa55cc2c0d8731e485ef39d2a18e85e81f924790437656b75f1944512629817e4af4191d7 + SOURCE3=$SPELL-$VERSION-20131026.diff.bz2 SOURCE4=$SOURCE3.sign SOURCE3_URL[0]=http://loop-aes.sourceforge.net/updates/$SOURCE3 SOURCE3_URL[1]=http://koti.tnnet.fi/jari.ruusu/linux/$SOURCE3 @@ -12,12 +12,12 @@ if [[ $UL_VERSION == aes ]]; then SOURCE3_GPG=loop-AES.gpg:$SOURCE4:UPSTREAM_KEY SOURCE4_IGNORE=signature else - VERSION=2.23.2 - SOURCE_HASH=sha512:0ff64ac8193940ec8ff9feea2c10929de1e11b9ec6a199316f12ea6ad73d32a53efcb4733511322c76751b086b18bbfe6fc9f5fc1e4da6ae0c5bfa092c5b4f99 + VERSION=2.24 + SOURCE_HASH=sha512:9e1945646a64420226e5af4546022ee604fdba89f91ee474b941075fa55cc2c0d8731e485ef39d2a18e85e81f924790437656b75f1944512629817e4af4191d7 SECURITY_PATCH=2 fi BRANCH=`echo $VERSION | cut -d . -f 1,2` - SOURCE=$SPELL-$VERSION.tar.bz2 + SOURCE=$SPELL-$VERSION.tar.xz # SOURCE2=$SOURCE.asc SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION" SOURCE_URL[0]=$KERNEL_URL/pub/linux/utils/$SPELL/v$BRANCH/$SOURCE diff --git a/utils/util-linux/HISTORY b/utils/util-linux/HISTORY index bf5081c82c..bc566a39af 100644 --- a/utils/util-linux/HISTORY +++ b/utils/util-linux/HISTORY @@ -1,3 +1,14 @@ +2013-11-20 Vlad Glagolev <stealth@sourcemage.org> + * DETAILS: updated aes version to 2.24; updated aes patch to 20131026 + * BUILD: readability++; disable nologin (provided by shadow); disable + last and mesg (provided by simpleinit-msb) + * PRE_BUILD: verify aes patch source + * DEPENDS: fixed deprecated linux-pam flags; added python and libcap-ng + optional dependencies; added check for automake + +2013-11-17 Treeve Jelbert <treeve@sourcemage.org> + * DETAILS: version to 2.24 + 2013-08-02 Treeve Jelbert <treeve@sourcemage.org> * DETAILS: version to 2.23.2 diff --git a/utils/util-linux/PRE_BUILD b/utils/util-linux/PRE_BUILD index 5757181be3..9285b6063a 100755 --- a/utils/util-linux/PRE_BUILD +++ b/utils/util-linux/PRE_BUILD @@ -2,5 +2,7 @@ default_pre_build && cd "$SOURCE_DIRECTORY" && if [[ $UL_VERSION == aes ]]; then - bzcat "$SOURCE_CACHE/$SOURCE3" | patch -p1 + verify_file 3 && + bzcat "$SOURCE_CACHE/$SOURCE3" | patch -p1 && + autoreconf -fi fi diff --git a/x11-libs/wine/DETAILS b/x11-libs/wine/DETAILS index d37837183b..cbeda87705 100755 --- a/x11-libs/wine/DETAILS +++ b/x11-libs/wine/DETAILS @@ -12,9 +12,9 @@ SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-git" FORCE_DOWNLOAD=1 else if [[ $WINE_BRANCH == devel ]]; then - VERSION=1.7.6 + VERSION=1.7.7 else - VERSION=1.6 + VERSION=1.6.1 fi SOURCE=$SPELL-$VERSION.tar.bz2 SOURCE2=$SOURCE.sign diff --git a/x11-libs/wine/HISTORY b/x11-libs/wine/HISTORY index abbec6978c..f150f7c894 100644 --- a/x11-libs/wine/HISTORY +++ b/x11-libs/wine/HISTORY @@ -1,3 +1,6 @@ +2013-11-26 Ladislav Hagara <hgr@vabo.cz> + * DETAILS: 1.6.1 & 1.7.7 + 2013-11-10 Treeve Jelbert <treeve@sourcemage.org> * DETAILS: version 1.7.6 (devel) * BUILD: build fix for gcc-4.8.x diff --git a/xorg-app/xkbcomp/DETAILS b/xorg-app/xkbcomp/DETAILS index 5f746e4a0d..cd681e30ab 100755 --- a/xorg-app/xkbcomp/DETAILS +++ b/xorg-app/xkbcomp/DETAILS @@ -1,7 +1,7 @@ SPELL=xkbcomp PKG=xkbcomp - VERSION=1.2.3 - SOURCE_HASH=sha512:89de9318d8f7dbf7ca31889a1da51f38a0f71ee33d324f2942553ddd0a35158de3b6f819f310601021805e8268ad3d02d23c83a1c4bda04f9ebc31a9d1670b3d + VERSION=1.2.4 + SOURCE_HASH=sha512:51d6ba1dc4d9c4b8f52320990326f50ac4cc4fb45a939875308d23fe366dc287cbd252759a839a4780c165fc1e972b8cf031cd26622a10a19cb190e38d1d68c4 SOURCE=${PKG}-${VERSION}.tar.bz2 SOURCE_URL[0]=http://xorg.freedesktop.org/releases/individual/app/${SOURCE} SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${PKG}-${VERSION} diff --git a/xorg-app/xkbcomp/HISTORY b/xorg-app/xkbcomp/HISTORY index ab794ab6d2..33f8070b26 100644 --- a/xorg-app/xkbcomp/HISTORY +++ b/xorg-app/xkbcomp/HISTORY @@ -1,3 +1,6 @@ +2013-11-23 Ismael Luceno <ismael@sourcemage.org> + * DETAILS: updated spell to 1.2.4 + 2012-02-01 Eric Sandall <sandalle@sourcemage.org> * DEPENDS: Depends on libpthread-stubs diff --git a/xorg-data/xkeyboard-config/DETAILS b/xorg-data/xkeyboard-config/DETAILS index 0171af7f18..5d583821ae 100755 --- a/xorg-data/xkeyboard-config/DETAILS +++ b/xorg-data/xkeyboard-config/DETAILS @@ -1,10 +1,8 @@ SPELL=xkeyboard-config VERSION=2.10.1 SOURCE_HASH=sha512:e21927e365f4742d710bf414c312a9bcaf46d881ee274f1baa0a288339477fa8aa24c338473f96ec658133205f21db43d1737d6c59c77999344244c43cff1be2 -# SOURCE_GPG="gurus.gpg:$SOURCE.sig:WORKS_FOR_ME" SOURCE=$SPELL-$VERSION.tar.bz2 - SOURCE_URL[0]=http://xorg.freedesktop.org/archive/individual/data/$SPELL/$SOURCE - SOURCE_URL[1]=http://people.freedesktop.org/~svu/$SOURCE + SOURCE_URL[0]=http://www.x.org/releases/individual/data/$SPELL/$SOURCE SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION" WEB_SITE=http://xorg.freedesktop.org/ ENTERED=20051125 diff --git a/xorg-data/xkeyboard-config/HISTORY b/xorg-data/xkeyboard-config/HISTORY index d64757864b..5536ce009b 100644 --- a/xorg-data/xkeyboard-config/HISTORY +++ b/xorg-data/xkeyboard-config/HISTORY @@ -1,6 +1,12 @@ +2013-11-23 Ismael Luceno <ismael@sourcemage.org> + * DETAILS: Fixed SOURCE_URL[0] + 2013-10-28 Treeve Jelbert <treeve@sourcemage.org> * DETAILS: version 2.10.1 +2011-08-19 Bor Kraljič <pyrobor@ver.si> + * BUILD: commented unrecognized option (issue #30) + 2013-05-29 Treeve Jelbert <treeve@sourcemage.org> * DETAILS: version 2.9 diff --git a/xorg-lib/libx11/CONFIGURE b/xorg-lib/libx11/CONFIGURE index f7eb220e9e..a2b8bc4049 100755 --- a/xorg-lib/libx11/CONFIGURE +++ b/xorg-lib/libx11/CONFIGURE @@ -4,11 +4,13 @@ config_query_option LIBX11_OPTS \ "--enable-secure-rpc" \ "--disable-secure-rpc" && -config_query_option LIBX11_OPTS \ - "Enable loadable i18n module support?" \ - n \ - "--enable-loadable-i18n" \ - "--disable-loadable-i18n" && +# NOTE: Loadable i18n support breaks XIM on UTF-8 locales +list_add LIBX11_OPTS --disable-loadable-i18n +#config_query_option LIBX11_OPTS \ +# "Enable loadable i18n module support?" \ +# n \ +# "--enable-loadable-i18n" \ +# "--disable-loadable-i18n" && config_query_option LIBX11_OPTS \ "Enable loadable xcursor library support?" \ diff --git a/xorg-lib/libx11/HISTORY b/xorg-lib/libx11/HISTORY index 8d158a2e02..40f58f398f 100644 --- a/xorg-lib/libx11/HISTORY +++ b/xorg-lib/libx11/HISTORY @@ -1,3 +1,6 @@ +2013-11-22 Ismael Luceno <ismael@sourcemage.org> + * CONFIGURE: Disable i18n option, breaks XIM + UTF-8 + 2013-09-09 Treeve Jelbert <treeve@sourcemage.org> * DETAILS: version 1.6.2 |