diff options
author | Bor Kraljič | 2011-10-11 14:50:52 +0200 |
---|---|---|
committer | Bor Kraljič | 2011-10-11 14:50:52 +0200 |
commit | f29c35ed06ea67ab6b4570c7d6ed0d3f60561ce8 (patch) | |
tree | 883e61649bed5b4c10f323a88f125543d501576e | |
parent | a85925aa72f9718c4b6f4ccd7fac6bba48203a4e (diff) | |
parent | c90805d6118130eb6fa5b7048abae61763a8a442 (diff) |
Merge branch 'master' into devel-kde3_removal
31 files changed, 118 insertions, 84 deletions
@@ -1,3 +1,6 @@ +2011-10-10 Vlad Glagolev <stealth@sourcemage.org> + * utils/acpid2: new spell, acpid for netlink + 2011-10-10 Ismael Luceno <ismael@sourcemage.org> * graphics/mypaint: new spell, graphics application for digital painters diff --git a/ftp/transmission/DETAILS b/ftp/transmission/DETAILS index 97c70719aa..b675ec7db9 100755 --- a/ftp/transmission/DETAILS +++ b/ftp/transmission/DETAILS @@ -2,7 +2,7 @@ VERSION=2.41 SECURITY_PATCH=1 SOURCE=$SPELL-$VERSION.tar.bz2 - SOURCE_URL[0]=http://mirrors.m0k.org/$SPELL/files/$SOURCE + SOURCE_URL[0]=http://download.transmissionbt.com/files/$SOURCE SOURCE_GPG=gurus.gpg:$SOURCE.sig SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION" WEB_SITE=http://www.transmissionbt.com/ diff --git a/ftp/transmission/HISTORY b/ftp/transmission/HISTORY index 515569d18f..fdfa98cc00 100644 --- a/ftp/transmission/HISTORY +++ b/ftp/transmission/HISTORY @@ -1,5 +1,5 @@ 2011-10-10 Vlad Glagolev <stealth@sourcemage.org> - * DETAILS: updated spell to 2.41 + * DETAILS: updated spell to 2.41; updated SOURCE_URL 2011-10-09 Vlad Glagolev <stealth@sourcemage.org> * DETAILS: updated spell to 2.40 diff --git a/http/midori/DETAILS b/http/midori/DETAILS index fc57c6c786..93b366fcff 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" else - VERSION=0.4.0 + VERSION=0.4.1 BRANCH=`echo $VERSION | cut -d . -f 1,2` SOURCE=$SPELL-$VERSION.tar.bz2 SOURCE_URL[0]=http://archive.xfce.org/src/apps/$SPELL/$BRANCH/$SOURCE - SOURCE_HASH=sha512:8a48bfdfd630e85371caa7be9da56925e2bb1abfa1bcdfda59643493753d66c1b96b68e8fd8194455439b4ed85413cefdc3b14cc3738f47a1691faf0e27633bd + SOURCE_HASH=sha512:970bbb70cf84dc5b51be0966085335613636960ad17cbf463e9b11683d109480de0b2d45832cfe523ebc5d44bd8f855526ad8949006fcae3427ca88a33727c8a SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION" fi WEB_SITE=http://software.twotoasts.de/?page=midori diff --git a/http/midori/HISTORY b/http/midori/HISTORY index 6879454ec8..ce516d94e6 100644 --- a/http/midori/HISTORY +++ b/http/midori/HISTORY @@ -1,3 +1,7 @@ +2011-10-10 Vlad Glagolev <stealth@sourcemage.org> + * DETAILS: updated spell to 0.4.1 + * PRE_BUILD, webkit-1.6.patch: removed, fixed by upstream + 2011-10-01 Vlad Glagolev <stealth@sourcemage.org> * PRE_BUILD: added, to apply the patch * webkit-1.6.patch: added, to fix compilation with webkit 1.6 diff --git a/http/midori/PRE_BUILD b/http/midori/PRE_BUILD deleted file mode 100755 index 01e5a8ecac..0000000000 --- a/http/midori/PRE_BUILD +++ /dev/null @@ -1,4 +0,0 @@ -default_pre_build && -cd "$SOURCE_DIRECTORY" && - -patch -p1 < "$SPELL_DIRECTORY/webkit-1.6.patch" diff --git a/http/midori/webkit-1.6.patch b/http/midori/webkit-1.6.patch deleted file mode 100644 index 620cdc96f4..0000000000 --- a/http/midori/webkit-1.6.patch +++ /dev/null @@ -1,59 +0,0 @@ -From 648d869e4ff69f121da97484a0fd553b005ca751 Mon Sep 17 00:00:00 2001 -From: Christian Dywan <christian@twotoasts.de> -Date: Wed, 21 Sep 2011 21:50:51 +0000 -Subject: Use DOM API to get selected text in WebKitGTK+ 1.5.1 - -Fixes: https://bugs.launchpad.net/midori/+bug/799603 ---- -diff --git a/midori/midori-view.c b/midori/midori-view.c -index 0d7a96e..e426e7f 100644 ---- a/midori/midori-view.c -+++ b/midori/midori-view.c -@@ -39,9 +39,11 @@ - #include <sys/utsname.h> - #endif - -+#if !WEBKIT_CHECK_VERSION (1, 5, 1) - /* This is unstable API, so we need to declare it */ - gchar* - webkit_web_view_get_selected_text (WebKitWebView* web_view); -+#endif - - static void - midori_view_construct_web_view (MidoriView* view); -@@ -4167,10 +4169,33 @@ midori_view_get_link_uri (MidoriView* view) - gboolean - midori_view_has_selection (MidoriView* view) - { -+#if WEBKIT_CHECK_VERSION (1, 5, 1) -+ WebKitDOMDocument* doc; -+ WebKitDOMDOMWindow* window; -+ WebKitDOMDOMSelection* selection; -+ WebKitDOMRange* range; -+#endif -+ - g_return_val_if_fail (MIDORI_IS_VIEW (view), FALSE); - -+ -+#if WEBKIT_CHECK_VERSION (1, 5, 1) -+ doc = webkit_web_view_get_dom_document (WEBKIT_WEB_VIEW (view->web_view)); -+ window = webkit_dom_document_get_default_view (doc); -+ selection = webkit_dom_dom_window_get_selection (window); -+ if (selection == NULL) -+ return FALSE; -+ -+ range = webkit_dom_dom_selection_get_range_at (selection, 0, NULL); -+ if (range == NULL) -+ return FALSE; -+ -+ katze_assign (view->selected_text, webkit_dom_range_get_text (range)); -+#else - katze_assign (view->selected_text, webkit_web_view_get_selected_text ( - WEBKIT_WEB_VIEW (view->web_view))); -+#endif -+ - if (view->selected_text && *view->selected_text) - return TRUE; - else --- -cgit diff --git a/kde4-apps/bluedevil/DETAILS b/kde4-apps/bluedevil/DETAILS index 378227ca8f..53106b696a 100755 --- a/kde4-apps/bluedevil/DETAILS +++ b/kde4-apps/bluedevil/DETAILS @@ -1,8 +1,8 @@ SPELL=bluedevil - VERSION=1.2.1 + VERSION=1.2.2 SOURCE="${SPELL}-${VERSION}.tar.bz2" SOURCE_URL[0]=$KDE_URL/stable/${SPELL}/${VERSION}/src/${SOURCE} - SOURCE_HASH=sha512:9ec439ff553b1f2a267a20d55edafb60794a2fc2f2e41778aaa276379f961fa3b36aa4d276c511a608021e1f200edaa77de69a0257a07cef05425785a943d583 + SOURCE_HASH=sha512:6485b97ef2a805668ea07ab32f8d54352c3e127631327ddb3eddfbb7f002738ee9f2edd1bee5d08479779a4db5fd789b139165186ca1665a69fea27b81b9444f SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}" WEB_SITE="https://projects.kde.org/projects/extragear/base/bluedevil" LICENSE[0]="GPL" diff --git a/kde4-apps/bluedevil/HISTORY b/kde4-apps/bluedevil/HISTORY index 7f42954916..d9c82613a5 100644 --- a/kde4-apps/bluedevil/HISTORY +++ b/kde4-apps/bluedevil/HISTORY @@ -1,3 +1,6 @@ +2011-10-11 Bor Kraljič <pyrobor@ver.si> + * DETAILS: updated spell to 1.2.2 + 2011-10-10 Bor Kraljič <pyrobor@ver.si> * DETAILS: updated spell to 1.2.1 diff --git a/kde4-apps/krusader4/DEPENDS b/kde4-apps/krusader4/DEPENDS index 9e50b8e370..10bb416dce 100755 --- a/kde4-apps/krusader4/DEPENDS +++ b/kde4-apps/krusader4/DEPENDS @@ -1,5 +1,4 @@ source "$SECTION_DIRECTORY/KDE_DEPENDS" && -optional_depends xxdiff '' '' 'compare by content support (via xxdiff)' && optional_depends kdesdk4 '' '' 'compare by content support (via Kompare)' && optional_depends kdepim4 '' '' 'mail support (via KMail)' && optional_depends krename4 '' '' 'multiple file rename support' && diff --git a/kde4-apps/krusader4/HISTORY b/kde4-apps/krusader4/HISTORY index 08d5e48424..ec894a0894 100644 --- a/kde4-apps/krusader4/HISTORY +++ b/kde4-apps/krusader4/HISTORY @@ -1,3 +1,6 @@ +2011-10-10 Bor Kraljič <pyrobor@ver.si> + * DEPENDS: removed optional dependency on xxdiff + 2011-09-04 Bor Kraljič <pyrobor@ver.si> * DETAILS: PATCHLEVEL++ for /opt/kde4 -> /usr change diff --git a/kde4-apps/libbluedevil/DETAILS b/kde4-apps/libbluedevil/DETAILS index 15a53f94bf..9958bf9377 100755 --- a/kde4-apps/libbluedevil/DETAILS +++ b/kde4-apps/libbluedevil/DETAILS @@ -1,9 +1,8 @@ SPELL=libbluedevil - VERSION=1.9 - PATCHLEVEL=1 + VERSION=1.9.1 SOURCE="${SPELL}-${VERSION}.tar.bz2" - SOURCE_URL[0]=$KDE_URL/unstable/${SPELL}/${VERSION}/src/${SOURCE} - SOURCE_HASH=sha512:ee5c075b0e29a95c51c9b89ba50b11dfde8cd404c6dbe315eb1c33ba5940b652423784dde3ee9a82b6f76f3c530b8f7dc5edcc2bbf80b5eb74c9f3dc0cde9df2 + SOURCE_URL[0]=$KDE_URL/stable/${SPELL}/${VERSION}/src/${SOURCE} + SOURCE_HASH=sha512:73209ba475435176e6f099ff86b49bf070ce3ff7ea262afd217908211260d1403636dea9d2382452dfed47914bc99e6f1d4e7d5777bd56509819673046f32475 SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}" WEB_SITE="https://projects.kde.org/projects/playground/libs/libbluedevil" LICENSE[0]="GPL" diff --git a/kde4-apps/libbluedevil/HISTORY b/kde4-apps/libbluedevil/HISTORY index fc87104fff..672aeea825 100644 --- a/kde4-apps/libbluedevil/HISTORY +++ b/kde4-apps/libbluedevil/HISTORY @@ -1,3 +1,6 @@ +2011-10-11 Bor Kraljič <pyrobor@ver.si> + * DETAILS: updated spell to 1.9.1 & Fixed SOURCE_URL[0] + 2011-09-04 Bor Kraljič <pyrobor@ver.si> * DETAILS: PATCHLEVEL++ for /opt/kde4 -> /usr change diff --git a/mail/exim/DETAILS b/mail/exim/DETAILS index 19ffa7b61a..5da4a8eea0 100755 --- a/mail/exim/DETAILS +++ b/mail/exim/DETAILS @@ -1,6 +1,6 @@ SPELL=exim - VERSION=4.76 - SECURITY_PATCH=5 + VERSION=4.77 + SECURITY_PATCH=6 SOURCE=$SPELL-$VERSION.tar.bz2 SOURCE2=$SOURCE.asc SOURCE_GPG="exim.gpg:$SOURCE2:VERIFIED_UPSTREAM_KEY" diff --git a/mail/exim/HISTORY b/mail/exim/HISTORY index 964b12aeb3..902294025a 100644 --- a/mail/exim/HISTORY +++ b/mail/exim/HISTORY @@ -1,3 +1,6 @@ +2011-10-10 Vlad Glagolev <stealth@sourcemage.org> + * DETAILS: updated spell to 4.77; SECURITY_PATCH++ + 2011-05-09 Vlad Glagolev <stealth@sourcemage.org> * DETAILS: updated spell to 4.76 (security: CVE-2011-1764) * DEPENDS: killed xorg-libs, see #14699 diff --git a/science-libs/vtk-data/DETAILS b/science-libs/vtk-data/DETAILS index 39e4901fd6..bce02d4d9c 100755 --- a/science-libs/vtk-data/DETAILS +++ b/science-libs/vtk-data/DETAILS @@ -1,13 +1,12 @@ SPELL=vtk-data - VERSION=5.0.4 + VERSION=5.8.0 SOURCE=vtkdata-$VERSION.tar.gz SOURCE_DIRECTORY=$BUILD_DIRECTORY/VTKData - SOURCE_URL[0]=http://public.kitware.com/VTK/files/release/5.0/$SOURCE + SOURCE_URL[0]=http://www.vtk.org/files/release/${VERSION:0:3}/$SOURCE WEB_SITE=http://public.kitware.com/VTK LICENSE[0]=http://public.kitware.com/VTK/copyright.php - SOURCE_HASH=sha512:c8af112082d7b8c94b668228d8536463410887d151d33502e902dbeabd37ce4da18b9bda62a83785e3037a743e2e12ea30c945a7d2433c2be1d6f0693c61623a + SOURCE_HASH=sha512:10fc5c999dab6fc12892d7e6587b155b462915d431e9a4c31d3a05dd0370d4bd28d73e47bae50262ed27b59a19b050adf2c43764c6e47e47eb7f126a460772b8 ENTERED=20020606 - UPDATED=20031119 ARCHIVE=off KEYWORDS="science libs" SHORT="example data sets for the vtk library" diff --git a/science-libs/vtk-data/HISTORY b/science-libs/vtk-data/HISTORY index 476172b7e9..1046896a32 100644 --- a/science-libs/vtk-data/HISTORY +++ b/science-libs/vtk-data/HISTORY @@ -1,3 +1,6 @@ +2011-10-10 Ladislav Hagara <hgr@vabo.cz> + * DETAILS: 5.8.0, UPDATED removed, SOURCE_URL[0] updated + 2008-01-31 Mathieu Lonjaret <lejatorn@sourcemage.org> * DETAILS: update to 5.0.4 diff --git a/science-libs/vtk/DETAILS b/science-libs/vtk/DETAILS index 25c81ef1af..b5e3cd7da7 100755 --- a/science-libs/vtk/DETAILS +++ b/science-libs/vtk/DETAILS @@ -1,13 +1,12 @@ SPELL=vtk - VERSION=5.0.4 + VERSION=5.8.0 SOURCE=${SPELL}-${VERSION}.tar.gz SOURCE_DIRECTORY=$BUILD_DIRECTORY/VTK - SOURCE_URL[0]=http://www.vtk.org/files/release/5.0/$SOURCE + SOURCE_URL[0]=http://www.vtk.org/files/release/${VERSION:0:3}/$SOURCE WEB_SITE=http://public.kitware.com/VTK LICENSE[0]=http://public.kitware.com/VTK/copyright.php - SOURCE_HASH=sha512:416cfcfa41bfa0bc8fdf8e9b77c5e9de2b37790806645d0e170f92c9be6c026145a78b08c00d164937afbb95d3e9d74bded17744879a38f3c5e9038283bd69ae + SOURCE_HASH=sha512:71d116b7bd0d7b485ab20d84749e24a6421cc66c9d2ac41b90a0d8b6621a6c1042ab83cad0103140f5da4c24f6dcefbaa812b64f8ae1da3b3046740443c5e328 ENTERED=20020606 - UPDATED=20031119 KEYWORDS="science libs" SHORT="library for visualization, image processing, 3D graphics" cat << EOF diff --git a/science-libs/vtk/HISTORY b/science-libs/vtk/HISTORY index dae978fb69..6e5b891857 100644 --- a/science-libs/vtk/HISTORY +++ b/science-libs/vtk/HISTORY @@ -1,3 +1,6 @@ +2011-10-10 Ladislav Hagara <hgr@vabo.cz> + * DETAILS: 5.8.0, UPDATED removed + 2010-11-03 Ladislav Hagara <hgr@vabo.cz> * DEPENDS: jpeg -> JPEG diff --git a/utils/acpid/CONFLICTS b/utils/acpid/CONFLICTS new file mode 100755 index 0000000000..f63114486d --- /dev/null +++ b/utils/acpid/CONFLICTS @@ -0,0 +1 @@ +conflicts acpid2 diff --git a/utils/acpid/HISTORY b/utils/acpid/HISTORY index 2d913df45b..96a2428485 100644 --- a/utils/acpid/HISTORY +++ b/utils/acpid/HISTORY @@ -1,3 +1,7 @@ +2011-10-10 Vlad Glagolev <stealth@sourcemage.org> + * PROVIDES: added, provides ACPI + * CONFLICTS: added, conflicts with acpid2 + 2010-02-17 Vlad Glagolev <stealth@sourcemage.org> * DETAILS: use vars more diff --git a/utils/acpid/PROVIDES b/utils/acpid/PROVIDES new file mode 100755 index 0000000000..78437d65f4 --- /dev/null +++ b/utils/acpid/PROVIDES @@ -0,0 +1 @@ +ACPI diff --git a/utils/acpid2/BUILD b/utils/acpid2/BUILD new file mode 100755 index 0000000000..500dac67b4 --- /dev/null +++ b/utils/acpid2/BUILD @@ -0,0 +1,5 @@ +make OPT="$CFLAGS" DESTDIR="$INSTALL_ROOT" && + +cd kacpimon && +make CFLAGS="$CFLAGS" && +cd .. diff --git a/utils/acpid2/CONFLICTS b/utils/acpid2/CONFLICTS new file mode 100755 index 0000000000..bfc51cbdc9 --- /dev/null +++ b/utils/acpid2/CONFLICTS @@ -0,0 +1 @@ +conflicts acpid diff --git a/utils/acpid2/DETAILS b/utils/acpid2/DETAILS new file mode 100755 index 0000000000..3b6b19370c --- /dev/null +++ b/utils/acpid2/DETAILS @@ -0,0 +1,22 @@ + SPELL=acpid2 + SPELLX=acpid + VERSION=2.0.12 + SOURCE=$SPELLX-$VERSION.tar.gz + SOURCE_HASH=sha512:434050039cf57b5c0b2d20ab6f3fefa842f2fdcfdc783a6cb2058f941f2f55757c0dc744988010f3071c059659d82075ef18105615745d72fa3f15e78e7936cd + SOURCE_URL[0]=http://tedfelix.com/linux/$SOURCE +SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELLX-$VERSION" + GATHER_DOCS=off + WEB_SITE=http://tedfelix.com/linux/acpid-netlink.html + ENTERED=20111010 + LICENSE=GPL + KEYWORDS="acpi utils" + SHORT="acpid for netlink" +cat << EOF +In recent linux kernels, the /proc/acpi/event interface has been deprecated. + +The same information (and more) is available via netlink (a way for the kernel +to communicate with userspace that is usually used for networking) and the input +layer (mouse, keyboard, power button, etc...). + +This version of acpid supports netlink and the input layer. +EOF diff --git a/utils/acpid2/FINAL b/utils/acpid2/FINAL new file mode 100755 index 0000000000..8cb9b0dd19 --- /dev/null +++ b/utils/acpid2/FINAL @@ -0,0 +1,7 @@ +if [[ ! -d /proc/acpi ]]; then + message "${PROBLEM_COLOR}" + message "WARNING: Your current kernel does not have ACPI support enabled. In" + message "order to be able to use the Advanced Configuration and Power" + message "Interface support you need to recompile your kernel with ACPI." + message "${DEFAULT_COLOR}" +fi diff --git a/utils/acpid2/HISTORY b/utils/acpid2/HISTORY new file mode 100644 index 0000000000..5122954dab --- /dev/null +++ b/utils/acpid2/HISTORY @@ -0,0 +1,3 @@ +2011-10-10 Vlad Glagolev <stealth@sourcemage.org> + * DETAILS, BUILD, INSTALL, CONFLICTS, PROVIDES, FINAL, + init.d/acpid{,.conf}: spell created diff --git a/utils/acpid2/INSTALL b/utils/acpid2/INSTALL new file mode 100755 index 0000000000..5f09dcbf08 --- /dev/null +++ b/utils/acpid2/INSTALL @@ -0,0 +1,18 @@ +make DESTDIR="$INSTALL_ROOT" install && + +if [[ $INIT_INSTALLED ]]; then + install_config_file "$SPELL_DIRECTORY/init.d/acpid.conf" \ + "$INSTALL_ROOT/etc/sysconfig/acpid" +fi && + +if [[ ! -d "$INSTALL_ROOT/etc/acpi/events" ]]; then + install -vm 755 -d "$INSTALL_ROOT/etc/acpi/events" +fi && + +if [[ ! -d "$INSTALL_ROOT/etc/acpi/actions" ]]; then + install -vm 755 -d "$INSTALL_ROOT/etc/acpi/actions" +fi && + +cd kacpimon && +default_install && +install -vm 644 kacpimon.8 "$INSTALL_ROOT/usr/share/man/man8" diff --git a/utils/acpid2/PROVIDES b/utils/acpid2/PROVIDES new file mode 100755 index 0000000000..78437d65f4 --- /dev/null +++ b/utils/acpid2/PROVIDES @@ -0,0 +1 @@ +ACPI diff --git a/utils/acpid2/init.d/acpid b/utils/acpid2/init.d/acpid new file mode 100644 index 0000000000..6b03ea7b2e --- /dev/null +++ b/utils/acpid2/init.d/acpid @@ -0,0 +1,10 @@ +#!/bin/bash + +. /etc/sysconfig/acpid + +PROGRAM=/usr/sbin/acpid +ARGS="$ACPID_ARGS" +RUNLEVEL=S +NEEDS="+local_fs" + +. /etc/init.d/smgl_init diff --git a/utils/acpid2/init.d/acpid.conf b/utils/acpid2/init.d/acpid.conf new file mode 100644 index 0000000000..b42508d62b --- /dev/null +++ b/utils/acpid2/init.d/acpid.conf @@ -0,0 +1,3 @@ +# For the arguments and description see acpid(8) + +ACPID_ARGS="-l" |