From 169d490f3c0b08511b4cb2a38601bff3d679ac78 Mon Sep 17 00:00:00 2001 From: "B. Watson" Date: Thu, 10 Sep 2015 17:59:06 -0400 Subject: network/uget: Updated for version 2.0.1, updated script. --- network/uget/README | 12 +++++++++--- network/uget/curlopt_nosignal.diff | 11 ----------- network/uget/slack-desc | 2 +- network/uget/uget.SlackBuild | 37 +++++++++++++++++++++++++------------ network/uget/uget.info | 6 +++--- 5 files changed, 38 insertions(+), 30 deletions(-) delete mode 100644 network/uget/curlopt_nosignal.diff diff --git a/network/uget/README b/network/uget/README index fc4085983b..f36f64944b 100644 --- a/network/uget/README +++ b/network/uget/README @@ -3,6 +3,12 @@ uGet is a Free and Open Source download manager. It allows for queuing downloads, file type-based classification of downloads, and is lightweight. -Optionally, uget can be compiled with support for the optional -dependency aria2. This is autodetected at build time. You can -forcibly disable aria2 support by passing ARIA2=no to the script. +Optionally, uget can be compiled with support for the optional dependency +aria2. This is autodetected at build time. You can forcibly disable +aria2 support by passing ARIA2=no to the script. + +uGet can also be compiled without support for notifications. To do this, +pass LIBNOTIFY=no to the script. + +If you're upgrading from uGet 1.x, run "uget-gtk-1to2" to convert your +old settings in ~/.config/uGet to the format used by uGet 2.x. diff --git a/network/uget/curlopt_nosignal.diff b/network/uget/curlopt_nosignal.diff deleted file mode 100644 index 5310970fdb..0000000000 --- a/network/uget/curlopt_nosignal.diff +++ /dev/null @@ -1,11 +0,0 @@ -diff -Naur uget-1.8.0/uglib/UgXmlrpc.c uget-1.8.0.patched//uglib/UgXmlrpc.c ---- uget-1.8.0/uglib/UgXmlrpc.c 2011-04-28 21:34:25.000000000 -0400 -+++ uget-1.8.0.patched//uglib/UgXmlrpc.c 2012-01-02 15:00:39.000000000 -0500 -@@ -111,6 +111,7 @@ - xmlrpc->user_agent = g_strdup (user_agent ? user_agent : "uGet/1.7"); - - curl_easy_setopt (xmlrpc->curl, CURLOPT_URL, xmlrpc->uri); -+ curl_easy_setopt (xmlrpc->curl, CURLOPT_NOSIGNAL , 1); - curl_easy_setopt (xmlrpc->curl, CURLOPT_USERAGENT, xmlrpc->user_agent); - } - diff --git a/network/uget/slack-desc b/network/uget/slack-desc index a2a031e60c..99c42282d6 100644 --- a/network/uget/slack-desc +++ b/network/uget/slack-desc @@ -13,7 +13,7 @@ uget: uget: It allows for queuing downloads, file type-based classification of uget: downloads, and is lightweight. uget: -uget: +uget: Build options: ARIA2=@A, LIBNOTIFY=@L uget: uget: uget: diff --git a/network/uget/uget.SlackBuild b/network/uget/uget.SlackBuild index 470207863c..250e50eea8 100644 --- a/network/uget/uget.SlackBuild +++ b/network/uget/uget.SlackBuild @@ -1,13 +1,23 @@ #!/bin/sh -# Slackware build script for Uget -# Written by Morten Juhl-Johansen Zölde-Fejér +# Slackware build script for uget +# Originally written by Morten Juhl-Johansen Zölde-Fejér # Updated by B. Watson -# Licensed under the WTFPL. See http://sam.zoy.org/wtfpl/ for details. +# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details. + +# 20150910 bkw: +# - upgrade to 2.0.1 +# - get rid of curlopt_nosignal.diff (no longer needed) +# - fix WTFPL URL +# - add LIBNOTIFY=no +# - document build options in slack-desc +# - cleanup README +# - install developer docs doc/*.txt +# - don't install empty AUTHORS and ChangeLog PRGNAM=uget -VERSION=${VERSION:-1.10.4} +VERSION=${VERSION:-2.0.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -53,18 +63,17 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; -# Prevent segfaults in Curl_resolv_timeout(). This patch has been accepted -# by upstream and will be in the next release. -patch -p1 < $CWD/curlopt_nosignal.diff +ARIA2="${ARIA2:-yes}" +LIBNOTIFY="${LIBNOTIFY:-yes}" -if [ "${ARIA2:-yes}" = "no" ]; then - ARIAFLAG="--disable-plugin-aria2" -fi +[ "$ARIA2" = "no" ] && ARIAFLAG="--disable-plugin-aria2" +[ "$LIBNOTIFY" = "no" ] && NOTIFYFLAG="--disable-notify" CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ $ARIAFLAG \ + $NOTIFYFLAG \ --disable-gstreamer \ --prefix=/usr \ --build=$ARCH-slackware-linux @@ -72,11 +81,15 @@ make make install-strip DESTDIR=$PKG mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a AUTHORS COPYING ChangeLog README $PKG/usr/doc/$PRGNAM-$VERSION +# 20150910 bkw: AUTHORS and ChangeLog are 0-byte placeholders in uget-2.0.1, +# add them back if this changes in future releases. +cp -a COPYING README doc/*.txt $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc +sed -e "s,@A,$ARIA2," \ + -e "s,@L,$LIBNOTIFY," \ + $CWD/slack-desc > $PKG/install/slack-desc cat $CWD/doinst.sh > $PKG/install/doinst.sh cd $PKG diff --git a/network/uget/uget.info b/network/uget/uget.info index 7650b34280..e7bbbad449 100644 --- a/network/uget/uget.info +++ b/network/uget/uget.info @@ -1,8 +1,8 @@ PRGNAM="uget" -VERSION="1.10.4" +VERSION="2.0.1" HOMEPAGE="http://ugetdm.com" -DOWNLOAD="http://downloads.sourceforge.net/urlget/uget-1.10.4.tar.gz" -MD5SUM="58139de0bd043cfeae0f22c239f4bbc5" +DOWNLOAD="http://downloads.sourceforge.net/project/urlget/uget%20%28stable%29/2.0.1/uget-2.0.1.tar.gz" +MD5SUM="b4249ae706dc57a3c08c78a5f3125b26" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" -- cgit v1.2.3