diff options
109 files changed, 571 insertions, 133 deletions
diff --git a/audio-drivers/pulseaudio/DEPENDS b/audio-drivers/pulseaudio/DEPENDS index 8364f5b3a4..21f5f3411f 100755 --- a/audio-drivers/pulseaudio/DEPENDS +++ b/audio-drivers/pulseaudio/DEPENDS @@ -17,10 +17,17 @@ optional_depends gettext \ "--enable-nls" \ "--disable-nls" \ "for Native Language Support" && -optional_depends xorg-libs \ +optional_depends libx11 \ "--enable-x11" \ "--disable-x11" \ "Enable X11 support?" && + +if is_depends_enabled $SPELL libx11; then + depends libice && + depends libsm && + depends libxext && + depends libxtst +fi && depends libsamplerate && optional_depends alsa-lib \ "--enable-alsa" \ @@ -34,6 +41,11 @@ optional_depends gtk+2 \ "--enable-gtk2" \ "--disable-gtk2" \ "for GTK+2 support" && + +if is_depends_enabled $SPELL gtk+2; then + depends libxxf86vm +fi && + optional_depends gconf2 \ "--enable-gconf" \ "--disable-gconf" \ diff --git a/audio-drivers/pulseaudio/HISTORY b/audio-drivers/pulseaudio/HISTORY index f1d6a06af6..400c7683e8 100644 --- a/audio-drivers/pulseaudio/HISTORY +++ b/audio-drivers/pulseaudio/HISTORY @@ -1,3 +1,7 @@ +2013-09-06 Eric Sandall <sandalle@sourcemage.org> + * DEPENDS: Replaced xorg-libs with libx11, libice, libsm, libxext, libxtst + gtk+2 support also needs libxxf86vm + 2013-07-28 Treeve Jelbert <treeve@sourcemage.org> * DEPENDS: udev => UDEV diff --git a/crypto/gnutls/DETAILS b/crypto/gnutls/DETAILS index ef98b038c2..ffe45478a4 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.3 + VERSION=3.2.4 SOURCE=$SPELL-$VERSION.tar.xz ;; esac diff --git a/crypto/gnutls/HISTORY b/crypto/gnutls/HISTORY index cfdfee5a9b..c850503b54 100644 --- a/crypto/gnutls/HISTORY +++ b/crypto/gnutls/HISTORY @@ -1,3 +1,6 @@ +2013-09-01 Treeve Jelbert <treeve@sourcemage.org> + * DETAILS: 3.2.4 + 2013-08-01 Treeve Jelbert <treeve@sourcemage.org> * DETAILS: 3.2.3 diff --git a/database/sqlite/DETAILS b/database/sqlite/DETAILS index 67003cf4f0..9b6cb0f32b 100755 --- a/database/sqlite/DETAILS +++ b/database/sqlite/DETAILS @@ -1,7 +1,7 @@ SPELL=sqlite - VERSION=3.7.17 - VERSIONX=autoconf-3071700 - SOURCE_HASH=sha512:96f3e51b46741450bc6b63779c10ebb4a7066860fe544385d64d1eda52592e376a589ef282ace2e1df73df61c10eab1a0d793abbdaf770e60289494d4bf3bcb4 + VERSION=3.8.0.2 + VERSIONX=autoconf-3080002 + SOURCE_HASH=sha512:936a5b8c809891883e11bb881edcc851ca25c55325699889ab123337aea37afa36129ea802a633e440824a97fff777e51816262e824b21fa387bcecddb91f9e7 SOURCE_DIRECTORY="$BUILD_DIRECTORY/${SPELL}-${VERSIONX}" SOURCE=${SPELL}-${VERSIONX}.tar.gz SOURCE_URL[0]=http://www.sqlite.org/2013/$SOURCE diff --git a/database/sqlite/HISTORY b/database/sqlite/HISTORY index 6bc674cc40..53e0d5067c 100644 --- a/database/sqlite/HISTORY +++ b/database/sqlite/HISTORY @@ -1,3 +1,6 @@ +2013-09-04 Treeve Jelbert <treeve@sourcemage.org> + * DETAILS: version 3.8.0.2 + 2013-05-20 Vlad Glagolev <stealth@sourcemage.org> * DETAILS: updated spell to 3.7.17 diff --git a/e-17/e17/DEPENDS b/e-17/e17/DEPENDS index 439fba3900..78c8b1eb8c 100755 --- a/e-17/e17/DEPENDS +++ b/e-17/e17/DEPENDS @@ -1,9 +1,12 @@ depends imlib2 && +depends libx11 && +depends libxau && depends libxcursor && depends libxdamage && +depends libxdmcp && +depends libxext && depends libxinerama && depends libxrandr && -depends xorg-libs && if [[ "x${E17_BRANCH}" == "xscm" ]]; then depends edbus && diff --git a/e-17/e17/HISTORY b/e-17/e17/HISTORY index eed1cac6de..fe6f3036c1 100644 --- a/e-17/e17/HISTORY +++ b/e-17/e17/HISTORY @@ -1,3 +1,7 @@ +2013-09-06 Eric Sandall <sandalle@sourcemage.org> + * DEPENDS: Replace xorg-libs with libx11, libxau, libxdmcp, and + libxext + 2013-07-30 Eric Sandall <sandalle@sourcemage.org> * DETAILS: Updated to 0.17.4 diff --git a/e-17/evas/DEPENDS b/e-17/evas/DEPENDS index 07b588abbb..ee2186e0a2 100755 --- a/e-17/evas/DEPENDS +++ b/e-17/evas/DEPENDS @@ -5,7 +5,8 @@ depends libtool && depends freetype2 && if [[ "x${EVAS_X11XCB}" == "xx11" ]]; then - depends xorg-libs "--enable-software-xlib --with-x" + depends libsm && + depends libx11 "--enable-software-xlib --with-x" elif [[ "x${EVAS_X11XCB}" == "xxcb" ]]; then depends libxcb "--enable-software-xcb --enable-async-events" # else "none" handled in BUILD diff --git a/e-17/evas/HISTORY b/e-17/evas/HISTORY index 54d7fc1ffc..bfc9eb1c1f 100644 --- a/e-17/evas/HISTORY +++ b/e-17/evas/HISTORY @@ -1,3 +1,6 @@ +2013-09-06 Eric Sandall <sandalle@sourcemage.org> + * DEPENDS: Replaced xorg-libs with libsm and libx11 + 2013-07-30 Eric Sandall <sandalle@sourcemage.org> * DETAILS: Updated to 1.7.8 diff --git a/gnome2-libs/dconf/DETAILS b/gnome2-libs/dconf/DETAILS index dad198eeba..626c37e185 100755 --- a/gnome2-libs/dconf/DETAILS +++ b/gnome2-libs/dconf/DETAILS @@ -1,8 +1,8 @@ SPELL=dconf - VERSION=0.14.1 + VERSION=0.16.1 SOURCE="${SPELL}-${VERSION}.tar.xz" - SOURCE_URL[0]=http://download.gnome.org/sources/${SPELL}/${VERSION:0:4}/${SOURCE} - SOURCE_HASH=sha512:110e1fe8ac986d61491f10c25ccfb687d914cbbacad70a0c6918bd07d32a19058050267e677626cb2dbc26928923f49b0495e0cf1eeeb210537f42b6936eed5f + SOURCE_URL[0]=http://ftp.gnome.org/pub/GNOME/sources/$SPELL/${VERSION:0:4}/$SOURCE + SOURCE_HASH=sha512:8ec267fd8e769da4e4316e697e76eeb228ad2699e7aad8b2d1034314073c650ac880449a8be79e5c86ba263db89a12eabc1cd40bbb1edf0b0c710e2e32567f78 SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}" WEB_SITE="http://live.gnome.org/dconf" LICENSE[0]="LGPL" diff --git a/gnome2-libs/dconf/HISTORY b/gnome2-libs/dconf/HISTORY index b8733d4d95..b5bc71cc97 100644 --- a/gnome2-libs/dconf/HISTORY +++ b/gnome2-libs/dconf/HISTORY @@ -1,3 +1,7 @@ +2013-09-02 Robin Cook <rcook@wyrms.net> + * DETAILS: updated VERSION to 0.16.1 + changed SOURCE_URL + 2013-06-11 Eric Sandall <sandalle@sourcemage.org> * Bug #450 (apply Javier's fix) diff --git a/graphics-libs/cegui/DEPENDS b/graphics-libs/cegui/DEPENDS index e3cfea26c7..3b535285d5 100755 --- a/graphics-libs/cegui/DEPENDS +++ b/graphics-libs/cegui/DEPENDS @@ -1,7 +1,8 @@ -depends freetype2 && -depends -sub CXX gcc && -depends pcre && -depends xorg-libs '--with-x' && +depends freetype2 && +depends -sub CXX gcc && +depends pcre && +depends libx11 '--with-x' && +depends libxxf86vm && optional_depends xerces-c \ "--enable-xerces-c" \ diff --git a/graphics-libs/cegui/HISTORY b/graphics-libs/cegui/HISTORY index 07714d5a5e..8a1b0f6d90 100644 --- a/graphics-libs/cegui/HISTORY +++ b/graphics-libs/cegui/HISTORY @@ -1,3 +1,6 @@ +2013-09-06 Eric Sandall <sandalle@sourcemage.org> + * DEPENDS: Replaced xorg-libs with libx11 and libxxf86vm + 2012-01-06 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de> * PRE_BUILD, gcc46.patch: fixed build with gcc 4.6 * CONFLICTS: added conflict with tinyxml diff --git a/i18n/ibus-anthy/DEPENDS b/i18n/ibus-anthy/DEPENDS index 18ba5ab46d..9562b9ddb5 100755 --- a/i18n/ibus-anthy/DEPENDS +++ b/i18n/ibus-anthy/DEPENDS @@ -1,2 +1,6 @@ depends ibus && -depends anthy +depends anthy && +depends gobject-introspection && +depends pygobject3 + + diff --git a/i18n/ibus-anthy/DETAILS b/i18n/ibus-anthy/DETAILS index 99620ed9f6..7b8a37b951 100755 --- a/i18n/ibus-anthy/DETAILS +++ b/i18n/ibus-anthy/DETAILS @@ -1,8 +1,7 @@ SPELL=ibus-anthy - VERSION=1.2.7 + VERSION=1.5.3 SOURCE="${SPELL}-${VERSION}.tar.gz" - SOURCE_GPG="gurus.gpg:${SOURCE}.sig:WORKS_FOR_ME" -# SOURCE_HASH=sha512:38815571c6421207c91e0af1406fb1a83ad3a9d7e31de9f0c3267e16cde41038fda179f07efae42da8208608fb0bebbe2ae310bbff110cbf0f0744d282b9e3a3 + SOURCE_HASH=sha512:490a89ef78e31ad9e0f61aadd1d93b7a670852a765cc784cbfa307a208aab4344e851dceee316dd04bdf004e901a1b23bf40ff505e55fa18ab9dafdf097263d3 SOURCE_URL[0]=http://ibus.googlecode.com/files/${SOURCE} SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}" WEB_SITE="http://code.google.com/p/ibus/" diff --git a/i18n/ibus-anthy/HISTORY b/i18n/ibus-anthy/HISTORY index fc71d68564..9f8a8f37ac 100644 --- a/i18n/ibus-anthy/HISTORY +++ b/i18n/ibus-anthy/HISTORY @@ -1,3 +1,7 @@ +2013-09-06 Robin Cook <rcook@wyrms.net> + * DETAILS: update to 1.5.3 + * DEPENDS: added addition depends + 2012-10-16 Eric Sandall <sandalle@sourcemage.org> * DETAILS: Updated to 1.2.7 diff --git a/i18n/ibus-anthy/ibus-anthy-1.2.7.tar.gz.sig b/i18n/ibus-anthy/ibus-anthy-1.2.7.tar.gz.sig Binary files differdeleted file mode 100644 index 0361acb87c..0000000000 --- a/i18n/ibus-anthy/ibus-anthy-1.2.7.tar.gz.sig +++ /dev/null diff --git a/i18n/ibus/DEPENDS b/i18n/ibus/DEPENDS index 0a27dae5fd..ab0b9693b0 100755 --- a/i18n/ibus/DEPENDS +++ b/i18n/ibus/DEPENDS @@ -1,6 +1,41 @@ depends python && -depends pyxdg && depends dbus-glib && depends dbus-python && depends notify-python && -depends iso-codes +depends iso-codes && + +optional_depends gtk+2 \ + "--enable-gtk2" \ + "--disable-gtk2" \ + "Build GTK2 IM Module?" && + +optional_depends gtk+3 \ + "--enable-gtk3" \ + "--disable-gtk3" \ + "Build GTK3 IM Module?" && + +optional_depends gobject-introspection \ + "--enable-introspection=yes" \ + "--enable-introspection=no" \ + "Enable introspection?" && + +optional_depends vala \ + "--enable-vala=yes" \ + "--enable-vala=no" \ + "Build Vala bindings?" && + +optional_depends gconf2 \ + "--enable-gconf" \ + "--disable-gconf" \ + "Use GConf code?" && + +optional_depends dconf \ + "--enable-dconf" \ + "--disable-dconf" \ + "Enable configuration based on dconf?" && + +optional_depends gtk-doc \ + "--enable-gtk-doc" \ + "--disable-gtk-doc" \ + "Use gtk-doc to build documentation?" + diff --git a/i18n/ibus/DETAILS b/i18n/ibus/DETAILS index e9c9767c6a..5ee1fcaab2 100755 --- a/i18n/ibus/DETAILS +++ b/i18n/ibus/DETAILS @@ -1,8 +1,7 @@ SPELL=ibus - VERSION=1.4.99.20121006 + VERSION=1.5.3 SOURCE="${SPELL}-${VERSION}.tar.gz" - SOURCE_GPG="gurus.gpg:${SOURCE}.sig:WORKS_FOR_ME" -# SOURCE_HASH=sha512:b7467a522aae99b15f76a05d17db5da14f01e6a17393c86888c0956223ba6563886e78c7ea9126d51d097b0d552eeebd3f7a1ce7d8230fa047848f81196307e1 + SOURCE_HASH=sha512:fe961f3a6143ea8cb9f14531cfdf6f6058bf8aba7285e6746b1750fb8267947730986e1fc0abb77c4545ddc0d835a41f76f316f7387c85de7bbf4010c10e79db SOURCE_URL[0]=http://${SPELL}.googlecode.com/files/${SOURCE} SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}" WEB_SITE="http://code.google.com/p/ibus/" diff --git a/i18n/ibus/HISTORY b/i18n/ibus/HISTORY index 4c4db7224d..48003b0fad 100644 --- a/i18n/ibus/HISTORY +++ b/i18n/ibus/HISTORY @@ -1,3 +1,7 @@ +2013-09-06 Robin Cook <rcook@wyrms.net> + * DETAILS: updated to 1.5.3 + * DEPENDS: updated to current depends and added optionals + 2012-10-16 Eric Sandall <sandalle@sourcemage.org> * DETAILS: Updated to 1.4.99.20121006 (for gnome-settings-daemon 3.6.1) Nothing else currently uses ibus diff --git a/i18n/ibus/ibus-1.4.99.20121006.tar.gz.sig b/i18n/ibus/ibus-1.4.99.20121006.tar.gz.sig Binary files differdeleted file mode 100644 index e6b673a86e..0000000000 --- a/i18n/ibus/ibus-1.4.99.20121006.tar.gz.sig +++ /dev/null diff --git a/libs/sdl/DEPENDS b/libs/sdl/DEPENDS index 70ca3452f4..882eb0cf63 100755 --- a/libs/sdl/DEPENDS +++ b/libs/sdl/DEPENDS @@ -11,6 +11,7 @@ optional_depends libx11 \ "for X11 video output support" && if is_depends_enabled $SPELL libx11;then + depends libice && depends libxext && depends libxrender && optional_depends libxrandr "--enable-video-x11-xrandr" '' "X11 Xrandr extension support" && diff --git a/libs/sdl/HISTORY b/libs/sdl/HISTORY index 3d7e860d45..15168060c6 100644 --- a/libs/sdl/HISTORY +++ b/libs/sdl/HISTORY @@ -1,3 +1,7 @@ +2013-09-06 Eric Sandall <sandalle@sourcemage.org> + * *SUB_DEPENDS: Replaced xorg-libs with libx11 + * DEPENDS: Additionally depend on libice when depending on libx11 + 2012-01-27 Robin Cook <rcook@wyrms.net> * DETAILS: updated to 1.2.15 * PRE_BUILD: removed mouse fix patch as no longer needed diff --git a/libs/sdl/PRE_SUB_DEPENDS b/libs/sdl/PRE_SUB_DEPENDS index aba4593089..d37176611a 100755 --- a/libs/sdl/PRE_SUB_DEPENDS +++ b/libs/sdl/PRE_SUB_DEPENDS @@ -1,5 +1,5 @@ case $THIS_SUB_DEPENDS in -X11-LIBS) is_depends_enabled $SPELL xorg-libs && return 0 ;; +X11-LIBS) is_depends_enabled $SPELL libx11 && return 0 ;; esac && return 1 diff --git a/libs/sdl/REPAIR^f2c2d723cb24017050035a9c9cd3f210^PRE_SUB_DEPENDS b/libs/sdl/REPAIR^f2c2d723cb24017050035a9c9cd3f210^PRE_SUB_DEPENDS new file mode 100755 index 0000000000..d37176611a --- /dev/null +++ b/libs/sdl/REPAIR^f2c2d723cb24017050035a9c9cd3f210^PRE_SUB_DEPENDS @@ -0,0 +1,5 @@ +case $THIS_SUB_DEPENDS in +X11-LIBS) is_depends_enabled $SPELL libx11 && return 0 ;; +esac && + +return 1 diff --git a/libs/sdl/SUB_DEPENDS b/libs/sdl/SUB_DEPENDS index 9d604f2531..aeca28ed9a 100755 --- a/libs/sdl/SUB_DEPENDS +++ b/libs/sdl/SUB_DEPENDS @@ -1,4 +1,4 @@ case $THIS_SUB_DEPENDS in -X11-LIBS) depends xorg-libs '--with-x' ;; +X11-LIBS) depends libx11 '--with-x' ;; *) echo unknown sub-depends!!! ; return 1 ;; esac diff --git a/libs/tbb/HISTORY b/libs/tbb/HISTORY index dd7d440a74..67177e9661 100644 --- a/libs/tbb/HISTORY +++ b/libs/tbb/HISTORY @@ -1,3 +1,6 @@ +2013-09-02 Robin Cook <rcook@wyrms.net> + * INSTALL: added -f to link command + 2013-08-07 Treeve Jelbert <treeve@sourcemage.org> * DETAILS: version 41_20130613 diff --git a/libs/tbb/INSTALL b/libs/tbb/INSTALL index f4641fd3ef..5966dcd757 100755 --- a/libs/tbb/INSTALL +++ b/libs/tbb/INSTALL @@ -3,7 +3,7 @@ cd $SOURCE_DIRECTORY && for foo in $(find -executable -type f); do bar=$(basename $foo) cp $foo ${INSTALL_ROOT}/usr/lib/$bar && - ln -s ${INSTALL_ROOT}/usr/lib/$bar ${INSTALL_ROOT}/usr/lib/$(expr match "${bar}" '\([a-z_]*\.so\)') + ln -sf ${INSTALL_ROOT}/usr/lib/$bar ${INSTALL_ROOT}/usr/lib/$(expr match "${bar}" '\([a-z_]*\.so\)') done && #install the include files diff --git a/mail/claws-mail/CONFIGURE b/mail/claws-mail/CONFIGURE index 49ff14fe0e..d4b180a7db 100755 --- a/mail/claws-mail/CONFIGURE +++ b/mail/claws-mail/CONFIGURE @@ -1,11 +1,73 @@ -config_query_option SYLPHEED_OPTS "Compile tray-icon plugin?" y \ +config_query_list CLAWSMAIL_GTK "Use which GTK to build?" gtk+2 gtk+3 && + +config_query_option CLAWSMAIL_OPTS "Compile tray-icon plugin?" y \ "--enable-trayicon-plugin" \ "--disable-trayicon-plugin" && -config_query_option SYLPHEED_OPTS "Compile crash dialog?" n \ +config_query_option CLAWSMAIL_OPTS "Compile crash dialog?" n \ "--enable-crash-dialog" \ "--disable-crash-dialog" && config_query_option SYLPHEED_OPTS "Enable IPv6 support?" y \ "--enable-ipv6" \ - "--disable-ipv6" + "--disable-ipv6" && + +config_query_option CLAWSMAIL_OPTS "Build generic UMPC Code?" n \ + "--enable-generic-umpc" \ + "--disable-generic-umpc" && + +config_query_option CLAWSMAIL_OPTS "Enable pthread support?" y \ + "--enable-pthread" \ + "--disable-pthread" && + +config_query_option CLAWSMAIL_OPTS "Build external address book support?" n \ + "--enable-new-addrbook" \ + "--disable-new-addrbook" && + +config_query_option CLAWSMAIL_OPTS "Enable acpi_notifier plugin?" y \ + "--enable-acpi_notifier-plugin" \ + "--disable-acpi_notifier-plugin" && + +config_query_option CLAWSMAIL_OPTS "Enable address_keeper plugin?" y \ + "--enable-address_keeper-plugin" \ + "--disable-address_keeper-plugin" && + +config_query_option CLAWSMAIL_OPTS "Enable attachement remover plugin?" y \ + "--enable-att_remover-plugin" \ + "--disable-att_remover-plugin" && + +config_query_option CLAWSMAIL_OPTS "Enable attachement warning plugin?" y \ + "--enable-attachwarner-plugin" \ + "--disable-attachwarner-plugin" && + +config_query_option CLAWSMAIL_OPTS "Enable fetchinfo plugin?" y \ + "--enable-fetchinfo-plugin" \ + "--disable-fetchinfo-plugin" && + +config_query_option CLAWSMAIL_OPTS "Enable mailmbox plugin?" y \ + "--enable-mailmbox-plugin" \ + "--disable-mailmbox-plugin" && +config_query_option CLAWSMAIL_OPTS "Enable newmail plugin?" y \ + "--enable-newmail-plugin" \ + "--disable-newmail-plugin" && + +config_query_option CLAWSMAIL_OPTS "Enable notification plugin?" y \ + "--enable-notification-plugin" \ + "--disable-notification-plugin" && + +config_query_option CLAWSMAIL_OPTS "Enable rssyl plugin?" y \ + "--enable-rssyl-plugin" \ + "--disable-rssyl-plugin" && + +config_query_option CLAWSMAIL_OPTS "Enable smime plugin?" y \ + "--enable-smime-plugin" \ + "--disable-smime-plugin" && + +config_query_option CLAWSMAIL_OPTS "Enable spam report plugin?" y \ + "--enable-spam_report-plugin" \ + "--disable-spam_report-plugin" && + +config_query_option CLAWSMAIL_OPTS "Enable vcalendar plugin?" y \ + "--enable-vcalendar-plugin" \ + "--disable-vcalendar-plugin" + diff --git a/mail/claws-mail/DEPENDS b/mail/claws-mail/DEPENDS index b867e20597..1e40fc580f 100755 --- a/mail/claws-mail/DEPENDS +++ b/mail/claws-mail/DEPENDS @@ -1,4 +1,8 @@ -depends gtk+2 && +if [ "$CLAWSMAIL_GTK" == "gtk+3" ]; then + depends gtk+3 --enable-gtk3 +else + depends gtk+2 +fi && depends c-ares && optional_depends "dbus" \ @@ -81,6 +85,68 @@ optional_depends network-manager \ "--disable-networkmanager-support" \ "support for NetworkManager" && +optional_depends valgrind \ + "--enable-valgrind" \ + "--disable-valgrind" \ + "Enable valgrind support for debugging?" && + +optional_depends libarchive \ + "--enable-archive-plugin" \ + "--disable-archive-plugin" \ + "to build archive plugin" && + +optional_depends bsfilter \ + "--enable-bsfilter-plugin" \ + "--disable-bsfilter-plugin" \ + "Enable bsfilter plugin (Bayesian spam filtering)" && + +optional_depends clamav \ + "--enable-clamd-plugin" \ + "--disable-clamd-plugin" \ + "Enable clamd plugin?" && + +optional_depends libchamplain \ + "--enable-geolocation-plugin" \ + "--disable-geolocation-plugin" \ + "Enable geolocation plugin" && + +optional_depends libgdata \ + "--enable-gdata-plugin" \ + "--disable-gdata-plugin" \ + "Enable gdata plugin?" && + +optional_depends libytnef \ + "--enable-tnef_parse-plugin" \ + "--disable-tnef_parse-plugin" \ + "Enable tnef_parse plugin?" && + +optional_depends poppler \ + "--enable-pdf_viewer-plugin" \ + "--disable-pdf_viewer-plugin" \ + "Enable pdf_viewer plugin?" && + +optional_depends perl \ + "--enable-perl-plugin" \ + "--disable-perl-plugin" \ + "Enable perl plugin?" && + +optional_depends PYTHON \ + "--enable-python-plugin" \ + "--disable-python-plugin" \ + "Enable python plugin?" && + +if [ "$CLAWSMAIL_GTK" == "gtk+3" ]; then + optional_depends webkitgtk3 \ + "--enable-fancy-plugin" \ + "--disable-fancy-plugin" \ + "Enable fancy plugin?" +else + optional_depends webkitgtk \ + "--enable-fancy-plugin" \ + "--disable-fancy-plugin" \ + "Enable fancy plugin?" +fi && + depends atk && depends cairo && depends curl && diff --git a/mail/claws-mail/HISTORY b/mail/claws-mail/HISTORY index 1c90e638e8..67ec17c878 100644 --- a/mail/claws-mail/HISTORY +++ b/mail/claws-mail/HISTORY @@ -1,3 +1,7 @@ +2013-09-02 Robin Cook <rcook@wyrms.net> + * CONFIGURE: added additional configure options + * DEPENDS: added additional optional depends + 2013-06-24 Ladislav Hagara <hgr@vabo.cz> * CONFLICTS: claws-mail-extra-plugins added, part of claws-mail now diff --git a/mail/postfix/DETAILS b/mail/postfix/DETAILS index 1c24ae6775..2895678863 100755 --- a/mail/postfix/DETAILS +++ b/mail/postfix/DETAILS @@ -4,7 +4,7 @@ if [[ "${POSTFIX_EXP}" == "y" ]]; then VERSION=2.9-20110615 PFIX_BRANCH=experimental else - VERSION=2.9.7 + VERSION=2.9.8 PFIX_BRANCH=official SECURITY_PATCH=1 fi diff --git a/mail/postfix/HISTORY b/mail/postfix/HISTORY index 7a8094450d..2e811a3f49 100644 --- a/mail/postfix/HISTORY +++ b/mail/postfix/HISTORY @@ -1,3 +1,6 @@ +2013-09-07 Vlad Glagolev <stealth@sourcemage.org> + * DETAILS: updated spell to 2.9.8 + 2013-07-20 Vlad Glagolev <stealth@sourcemage.org> * DETAILS: updated spell to 2.9.7 * no-db.patch: updated patch to support Linux kernel 3.x diff --git a/net/amap/BUILD b/net/amap/BUILD new file mode 100755 index 0000000000..27ba77ddaf --- /dev/null +++ b/net/amap/BUILD @@ -0,0 +1 @@ +true diff --git a/net/amap/DEPENDS b/net/amap/DEPENDS new file mode 100755 index 0000000000..cf43e0dcd9 --- /dev/null +++ b/net/amap/DEPENDS @@ -0,0 +1 @@ +depends thc-amap diff --git a/net/amap/DETAILS b/net/amap/DETAILS index 6ba8a82cb8..8df27f4c78 100755 --- a/net/amap/DETAILS +++ b/net/amap/DETAILS @@ -1,17 +1,7 @@ - SPELL=amap - VERSION=5.4 - SOURCE="${SPELL}-${VERSION}.tar.gz" - SOURCE_URL[0]=http://www.thc.org/releases/${SOURCE} - SOURCE_HASH=sha512:e1a9f03940eded3eedad0028786f4ea6c18077072d52eb2f843ef0b4ff736bf1766c4bdb4eff52d3a8f6038d8f795e39be1c15bcae8283ddae8f40a7fff8647d -SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}" - WEB_SITE="http://www.thc.org/thc-amap/" - LICENSE[0]=GPL - ENTERED=20130829 - SHORT="Amap was innovative - the first tool to perform application protocol detection." -cat << EOF -Amap was the first next-generation scanning tool for pentesters. It attempts -to identify applications even if they are running on a different port -than normal. It also identifies non-ascii based applications. This is -achieved by sending trigger packets, and looking up the responses in a list -of response strings. -EOF + SPELL=amap + VERSION=0 + PATCHLEVEL=9999 + SHORT="deprecated" + cat << EOF + deprecated spell [replaced by thc-amap] + EOF diff --git a/net/amap/DOWNLOAD b/net/amap/DOWNLOAD new file mode 100755 index 0000000000..27ba77ddaf --- /dev/null +++ b/net/amap/DOWNLOAD @@ -0,0 +1 @@ +true diff --git a/net/amap/HISTORY b/net/amap/HISTORY index 0e4a90c345..a0a3b03a57 100644 --- a/net/amap/HISTORY +++ b/net/amap/HISTORY @@ -1,3 +1,8 @@ +2013-09-04 David C. Haley <khoralin@gmail.com> + * Spell deprecated. Deprecating in favor of original spell. + * PATCHLEVEL=9999 + * DETAILS: version 0 + 2013-08-29 David C. Haley <khoralin@gmail.com> * DETAILS: spell created diff --git a/net/amap/INSTALL b/net/amap/INSTALL new file mode 100755 index 0000000000..27ba77ddaf --- /dev/null +++ b/net/amap/INSTALL @@ -0,0 +1 @@ +true diff --git a/net/amap/PRE_BUILD b/net/amap/PRE_BUILD new file mode 100755 index 0000000000..27ba77ddaf --- /dev/null +++ b/net/amap/PRE_BUILD @@ -0,0 +1 @@ +true diff --git a/net/amap/UP_TRIGGERS b/net/amap/UP_TRIGGERS new file mode 100644 index 0000000000..8bc6d9942c --- /dev/null +++ b/net/amap/UP_TRIGGERS @@ -0,0 +1,2 @@ +up_trigger amap dispel_self +up_trigger thc_amap cast_self diff --git a/net/thc-amap/BUILD b/net/thc-amap/BUILD deleted file mode 100755 index 3b5db3c849..0000000000 --- a/net/thc-amap/BUILD +++ /dev/null @@ -1,9 +0,0 @@ -./configure && -sedit "s:/usr/local:/:" Makefile && -sedit "s:/bin:usr/bin:" Makefile && -sedit "s:/etc:etc/amap:" Makefile && -sedit "s:/man/man1:usr/man/man1:" Makefile && -sedit "s:/usr/local:/usr:" amap.h && -sedit "s:AMAP_PREFIX:\"/\":" amap-lib.c && -sedit "s:etc/:etc/amap/:" amap-lib.c && -make diff --git a/net/thc-amap/CONFLICTS b/net/thc-amap/CONFLICTS new file mode 100755 index 0000000000..0757c824f7 --- /dev/null +++ b/net/thc-amap/CONFLICTS @@ -0,0 +1 @@ +conflicts amap y diff --git a/net/thc-amap/DETAILS b/net/thc-amap/DETAILS index 1c271dc3d2..cf468820b5 100755 --- a/net/thc-amap/DETAILS +++ b/net/thc-amap/DETAILS @@ -1,12 +1,11 @@ SPELL=thc-amap - VERSION=5.2 + VERSION=5.4 SOURCE=amap-$VERSION.tar.gz SOURCE_DIRECTORY=$BUILD_DIRECTORY/amap-$VERSION SOURCE_URL[0]=http://www.thc.org/releases/$SOURCE WEB_SITE=http://www.thc.org ENTERED=20041208 - UPDATED=20050429 - SOURCE_HASH=sha512:46d4f500751e709de03f3b03a717538657390780cc753498ba75dc09a6824f7765c66e72dab7362cc1696f9af7aab9a18f71ed736bf1ff54d7e1a21e2c251600 + SOURCE_HASH=sha512:e1a9f03940eded3eedad0028786f4ea6c18077072d52eb2f843ef0b4ff736bf1766c4bdb4eff52d3a8f6038d8f795e39be1c15bcae8283ddae8f40a7fff8647d LICENSE[0]=GPL KEYWORDS="net" SHORT="A next-generation scanning tool, identifies applications and services." diff --git a/net/thc-amap/HISTORY b/net/thc-amap/HISTORY index 3537547c21..1b52cdbb16 100644 --- a/net/thc-amap/HISTORY +++ b/net/thc-amap/HISTORY @@ -1,3 +1,9 @@ +2013-09-05 David C. Haley <khoralin@gmail.com> + * INSTALL: removed, no longer needed + * BUILD: removed, no longer needed + * PRE_BUILD: removed, no longer needed + * DETAILS: updated spell to 5.4 + 2006-09-21 Juuso Alasuutari <iuso@sourcemage.org> * DETAILS: [automated] Removed BUILD_API=2. diff --git a/net/thc-amap/INSTALL b/net/thc-amap/INSTALL deleted file mode 100755 index da6ceea8f8..0000000000 --- a/net/thc-amap/INSTALL +++ /dev/null @@ -1,9 +0,0 @@ -mkdir -p $INSTALL_ROOT/etc/amap && -mkdir -p $INSTALL_ROOT/usr/share/amap && - -install -m 755 amap amapcrap $INSTALL_ROOT/usr/bin && - -install -m 644 appdefs.trig appdefs.resp appdefs.rpc \ - $INSTALL_ROOT/etc/amap && - -install -m 644 amap.1 $INSTALL_ROOT/usr/share/man/man1/ diff --git a/net/thc-amap/PRE_BUILD b/net/thc-amap/PRE_BUILD deleted file mode 100755 index 7f9ef19728..0000000000 --- a/net/thc-amap/PRE_BUILD +++ /dev/null @@ -1,5 +0,0 @@ -default_pre_build && -cd $SOURCE_DIRECTORY && - -sedit "s:/usr/local:$INSTALL_ROOT/usr:" amap.h && -sedit "s:/bin:/share/amap:" amap.h diff --git a/perl-cpan/x11-protocol/DEPENDS b/perl-cpan/x11-protocol/DEPENDS index 999ba5c93d..3175185df7 100755 --- a/perl-cpan/x11-protocol/DEPENDS +++ b/perl-cpan/x11-protocol/DEPENDS @@ -1,3 +1,5 @@ -depends perl && -depends X11-SERVER && -depends X11-LIBS +depends perl && + +runtime_depends libx11 && +runtime_depends libxau && +runtime_depends libxext diff --git a/perl-cpan/x11-protocol/HISTORY b/perl-cpan/x11-protocol/HISTORY index e355cfd240..a58438f415 100644 --- a/perl-cpan/x11-protocol/HISTORY +++ b/perl-cpan/x11-protocol/HISTORY @@ -1,3 +1,7 @@ +2013-09-06 Eric Sandall <sandalle@sourcemage.org> + * DEPENDS: Per README, doesn't require an X11-SERVER on the current machine + Replace xorg-libs with libx11, libxau, and libxext as runtime dependencies + 2008-04-16 Mark Bainter <mbainter@sourcemage.org> * BUILD, DEPENDS, DETAILS, HISTORY: spell created diff --git a/printer/ghostscript/DETAILS b/printer/ghostscript/DETAILS index 85277f4e1e..4c4818797d 100755 --- a/printer/ghostscript/DETAILS +++ b/printer/ghostscript/DETAILS @@ -1,6 +1,6 @@ SPELL=ghostscript - VERSION=9.07 - SOURCE_HASH=sha512:7e075b82afd8057adb5b788d64e7bf6e1c769dd64acd74b8be13621504521ba088b3115984b0610967c1da6a54f6d824f7fef36b79264a949408912fc9a558d4 + VERSION=9.10 + SOURCE_HASH=sha512:59f380e52c84b69819ef7d321f323950c22306119cfa7b38809a23e83f9a3af1e35b5d66d9b9e9adef32131aa283a235deec346acced330d7ad7d1201fe7ca04 SOURCE=$SPELL-$VERSION.tar.bz2 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION" WEB_SITE=http://www.ghostscript.com/ diff --git a/printer/ghostscript/HISTORY b/printer/ghostscript/HISTORY index 47e158124e..b99cfd7fd6 100644 --- a/printer/ghostscript/HISTORY +++ b/printer/ghostscript/HISTORY @@ -1,3 +1,6 @@ +2013-09-02 Treeve Jelbert <treeve@sourcemage.org> + * DETAILS: version 9.10 + 2013-04-11 Treeve Jelbert <treeve@sourcemage.org> * DEPENDS: remove jasper diff --git a/python-pypi/mercurial/DETAILS b/python-pypi/mercurial/DETAILS index 4a82280e0a..b1785f2d61 100755 --- a/python-pypi/mercurial/DETAILS +++ b/python-pypi/mercurial/DETAILS @@ -1,6 +1,6 @@ SPELL=mercurial - VERSION=2.7 - SOURCE_HASH=sha512:e425778edb0f71c34e719e04561ee3de37feaa1be4d60b94c780aebdbe6d41f8f4ab15103a8bbe8894ebeb228c42f0e2cd41b8db840f8384e1cd7cd2d5b67b97 + VERSION=2.7.1 + SOURCE_HASH=sha512:f8ff09b852ebe36c86af30ccd43118006c44958441f8590e557634a19a7c01c9b077ca335ebc92fa86b33bc77388db1c12ce60eaaf31c695b46e4283fc00794f SOURCE=$SPELL-$VERSION.tar.gz SOURCE_URL[0]=http://mercurial.selenic.com/release/$SOURCE SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION" diff --git a/python-pypi/mercurial/HISTORY b/python-pypi/mercurial/HISTORY index aca8807b42..f1673595af 100644 --- a/python-pypi/mercurial/HISTORY +++ b/python-pypi/mercurial/HISTORY @@ -1,3 +1,6 @@ +2013-09-05 Treeve Jelbert <treeve@sourcemage.org> + * DETAILS: updated to 2.7.1 + 2013-08-05 Treeve Jelbert <treeve@sourcemage.org> * DETAILS: updated to 2.7 diff --git a/qt5/qtbase/DETAILS b/qt5/qtbase/DETAILS index c8fb695300..05a6768ac8 100755 --- a/qt5/qtbase/DETAILS +++ b/qt5/qtbase/DETAILS @@ -1,8 +1,8 @@ QT_URL=http://download.qt-project.org/official_releases/ SPELL=qtbase SPELLX=$SPELL-opensource-src - VERSION=5.1.0 - SOURCE_HASH=sha512:300f00045ba974d980859613f1409e3a9fb9a8405a1b6efaa03eae22fdd3c5e74e2fc2bf526e0ce3f0a80559a79a25ae64b3ab709fd0f06343fcdca7683ffe02 + VERSION=5.1.1 + SOURCE_HASH=sha512:db7e25a520584b10370d898747f2cfb84ebbce3a8b9027f373cac7ab713fe199da5465df2453d04107406101ad4eff8cd82871efab40377ff44d789a424667c3 SOURCE=$SPELLX-$VERSION.tar.xz SOURCE_URL=$QT_URL/qt/${VERSION%.?}/$VERSION/submodules/$SOURCE SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-$VERSION diff --git a/qt5/qtbase/HISTORY b/qt5/qtbase/HISTORY index f2a96277ec..97c665df9e 100644 --- a/qt5/qtbase/HISTORY +++ b/qt5/qtbase/HISTORY @@ -1,3 +1,6 @@ +2013-09-03 Treeve Jelbert <treeve@sourcemage.org> + * DETAILS: version 5.1.1 + 2013-07-28 Treeve Jelbert <treeve@sourcemage.org> * DEPENDS: udev => UDEV diff --git a/qt5/qtdeclarative/DETAILS b/qt5/qtdeclarative/DETAILS index 260543a4ea..f300a8b09a 100755 --- a/qt5/qtdeclarative/DETAILS +++ b/qt5/qtdeclarative/DETAILS @@ -1,8 +1,8 @@ QT_URL=http://download.qt-project.org/official_releases/ SPELL=qtdeclarative SPELLX=$SPELL-opensource-src - VERSION=5.1.0 - SOURCE_HASH=sha512:cc9260e57b7440d26f8d8ae2efabc3ea8bbe335816614f4b48130e098371a5eb24028ceb84cee9b3750d31c31b6238ba434e0679d57d38761bc91383d3304a0c + VERSION=5.1.1 + SOURCE_HASH=sha512:279511624723d6774ef308b9029d950b0be951c1c3b6b09f8d67962c927617db67b023c81065875d65c1dd2c048e618aa8b6b13a311040c6d5ddf1c42a4718f9 SOURCE=$SPELLX-$VERSION.tar.xz SOURCE_URL=$QT_URL/qt/${VERSION%.?}/$VERSION/submodules/$SOURCE SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-$VERSION diff --git a/qt5/qtdeclarative/HISTORY b/qt5/qtdeclarative/HISTORY index d20d3529a2..254ecd5957 100644 --- a/qt5/qtdeclarative/HISTORY +++ b/qt5/qtdeclarative/HISTORY @@ -1,3 +1,6 @@ +2013-09-03 Treeve Jelbert <treeve@sourcemage.org> + * DETAILS: version 5.1.1 + 2013-07-07 Treeve Jelbert <treeve@sourcemage.org> * DETAILS: version 5.1.0 diff --git a/qt5/qtgraphicaleffects/DETAILS b/qt5/qtgraphicaleffects/DETAILS index 69ab1f8f1d..37e6e2ac1c 100755 --- a/qt5/qtgraphicaleffects/DETAILS +++ b/qt5/qtgraphicaleffects/DETAILS @@ -1,8 +1,8 @@ QT_URL=http://download.qt-project.org/official_releases/ SPELL=qtgraphicaleffects SPELLX=$SPELL-opensource-src - VERSION=5.1.0 - SOURCE_HASH=sha512:0089979df80ffc85b6e820cb03268ed80e58e2631c14a9569818b0583d6204383b58ebabef82fe2452b3a48688dea761c1f1a19326b2a0513abf13b7610d99b7 + VERSION=5.1.1 + SOURCE_HASH=sha512:3ccc9215169e83a1975d24455ad38e3224d14c11c849a0b796f7020be385ef78b9a99f1ec885916ed29bd46c7ac9d7aaf20fe8115bebb18cc3c1b74c208420c0 SOURCE=$SPELLX-$VERSION.tar.xz SOURCE_URL=$QT_URL/qt/${VERSION%.?}/$VERSION/submodules/$SOURCE SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-$VERSION diff --git a/qt5/qtgraphicaleffects/HISTORY b/qt5/qtgraphicaleffects/HISTORY index aa70f31ef3..fa8bb5650c 100644 --- a/qt5/qtgraphicaleffects/HISTORY +++ b/qt5/qtgraphicaleffects/HISTORY @@ -1,3 +1,6 @@ +2013-09-03 Treeve Jelbert <treeve@sourcemage.org> + * DETAILS: version 5.1.1 + 2013-07-09 Treeve Jelbert <treeve@sourcemage.org> * DETAILS: version 5.1.0 diff --git a/qt5/qtimageformats/DETAILS b/qt5/qtimageformats/DETAILS index 3239e79bc5..91a9d1743e 100755 --- a/qt5/qtimageformats/DETAILS +++ b/qt5/qtimageformats/DETAILS @@ -1,8 +1,8 @@ QT_URL=http://download.qt-project.org/official_releases/ SPELL=qtimageformats SPELLX=$SPELL-opensource-src - VERSION=5.1.0 - SOURCE_HASH=sha512:9863c3830ca85555d2c2e8e9a8add190f08bd794a1703ca4a2c943de9313cf396cc98d110b7bae787564e933b0d8e75a91d583af8a148bb8dd5cb35912a70dde + VERSION=5.1.1 + SOURCE_HASH=sha512:c42144fe39df5da69eec6b00e54bb0d0795a7f8c1617094c9dd9c5f79f96ff7ba5c447bbd931aa730bf5dcebac8a7e8e6f397501264d7279233876df6cbd2771 SOURCE=$SPELLX-$VERSION.tar.xz SOURCE_URL=$QT_URL/qt/${VERSION%.?}/$VERSION/submodules/$SOURCE SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-$VERSION diff --git a/qt5/qtimageformats/HISTORY b/qt5/qtimageformats/HISTORY index bd6fac8afe..a65aabb82a 100644 --- a/qt5/qtimageformats/HISTORY +++ b/qt5/qtimageformats/HISTORY @@ -1,4 +1,7 @@ -2013-07/09 Treeve Jelbert <treeve@sourcemage.org> +2013-09-03 Treeve Jelbert <treeve@sourcemage.org> + * DETAILS: version 5.1.1 + +2013-07-09 Treeve Jelbert <treeve@sourcemage.org> * DETAILS: version 5.1.0 2013-04-12 Treeve Jelbert <treeve@sourcemage.org> diff --git a/qt5/qtjsbackend/DETAILS b/qt5/qtjsbackend/DETAILS index b8204f0128..81f70c05b2 100755 --- a/qt5/qtjsbackend/DETAILS +++ b/qt5/qtjsbackend/DETAILS @@ -1,8 +1,8 @@ QT_URL=http://download.qt-project.org/official_releases/ SPELL=qtjsbackend SPELLX=$SPELL-opensource-src - VERSION=5.1.0 - SOURCE_HASH=sha512:0ffd8670b8d4426aaacd12272a149626d4184e697a4a1fe71aa09c2d1214d255e6ae717a7b29a2599cc858d7b74f0115d4e27391d216ce12b8c2d39b5b3dd87c + VERSION=5.1.1 + SOURCE_HASH=sha512:5772b4fa73610a8c47ed07a46d020045e3f298b303e014772a2418af14350dbca6f7bc76db64cbcd1712f679e42ff4aa9d88feb658559fd7dd994c3810443b85 SOURCE=$SPELLX-$VERSION.tar.xz SOURCE_URL=$QT_URL/qt/${VERSION%.?}/$VERSION/submodules/$SOURCE SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-$VERSION diff --git a/qt5/qtjsbackend/HISTORY b/qt5/qtjsbackend/HISTORY index a41c6e2626..8853ef6232 100644 --- a/qt5/qtjsbackend/HISTORY +++ b/qt5/qtjsbackend/HISTORY @@ -1,3 +1,6 @@ +2013-09-03 Treeve Jelbert <treeve@sourcemage.org> + * DETAILS: version 5.1.1 + 2013-07-07 Treeve Jelbert <treeve@sourcemage.org> * DETAILS: version 5.1.0 diff --git a/qt5/qtmultimedia/DETAILS b/qt5/qtmultimedia/DETAILS index 66e6f7801c..9104c3c5c0 100755 --- a/qt5/qtmultimedia/DETAILS +++ b/qt5/qtmultimedia/DETAILS @@ -1,8 +1,8 @@ QT_URL=http://download.qt-project.org/official_releases/ SPELL=qtmultimedia SPELLX=$SPELL-opensource-src - VERSION=5.1.0 - SOURCE_HASH=sha512:12edaa20c2d1bbce7311fab2e273262570bfa537a985b5e11a044402ed9d552964dd233bba44809599793805daf997e9668cb31a98f903a97db4090086a8c51b + VERSION=5.1.1 + SOURCE_HASH=sha512:14e2ff2037d41220acca34534b947ae5918edbb878f118d34594b8bbc1c857a745b7a7eba21c063f18dc0d5de25cbee525d66cb203ab52165203ed4ccb185ec1 SOURCE=$SPELLX-$VERSION.tar.xz SOURCE_URL=$QT_URL/qt/${VERSION%.?}/$VERSION/submodules/$SOURCE SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-$VERSION diff --git a/qt5/qtmultimedia/HISTORY b/qt5/qtmultimedia/HISTORY index a66bb8f20c..a65aabb82a 100644 --- a/qt5/qtmultimedia/HISTORY +++ b/qt5/qtmultimedia/HISTORY @@ -1,3 +1,6 @@ +2013-09-03 Treeve Jelbert <treeve@sourcemage.org> + * DETAILS: version 5.1.1 + 2013-07-09 Treeve Jelbert <treeve@sourcemage.org> * DETAILS: version 5.1.0 diff --git a/qt5/qtquick1/DETAILS b/qt5/qtquick1/DETAILS index 7d8c2a8cad..2a8f756511 100755 --- a/qt5/qtquick1/DETAILS +++ b/qt5/qtquick1/DETAILS @@ -1,8 +1,8 @@ QT_URL=http://download.qt-project.org/official_releases/ SPELL=qtquick1 SPELLX=$SPELL-opensource-src - VERSION=5.1.0 - SOURCE_HASH=sha512:7ebc79ab860d10bcf95956e8a1778ba3f18ebe44b08fe448b9d79fc001729d6aec283873b402de94bf395e254dd0b094762090d6d9c9f5b3f5b2526686e50a11 + VERSION=5.1.1 + SOURCE_HASH=sha512:d42334280d365308b7402120a2b828544787254283ac1cdc6c4abe66075a05092fb016eeae169a52a813f8cef240d1d39b863319ba7d0231c7c936b7d59aa02d SOURCE=$SPELLX-$VERSION.tar.xz SOURCE_URL=$QT_URL/qt/${VERSION%.?}/$VERSION/submodules/$SOURCE SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-$VERSION diff --git a/qt5/qtquick1/HISTORY b/qt5/qtquick1/HISTORY index 4768309911..837c42b53f 100644 --- a/qt5/qtquick1/HISTORY +++ b/qt5/qtquick1/HISTORY @@ -1,4 +1,7 @@ -2013-07-094-13 Treeve Jelbert <treeve@sourcemage.org> +2013-09-03 Treeve Jelbert <treeve@sourcemage.org> + * DETAILS: version 5.1.1 + +2013-07-09 Treeve Jelbert <treeve@sourcemage.org> * DETAILS: version 5.1.0 2013-04-13 Treeve Jelbert <treeve@sourcemage.org> diff --git a/qt5/qtquickcontrols/DETAILS b/qt5/qtquickcontrols/DETAILS index ccd5609b13..2808d9b2eb 100755 --- a/qt5/qtquickcontrols/DETAILS +++ b/qt5/qtquickcontrols/DETAILS @@ -1,8 +1,8 @@ QT_URL=http://download.qt-project.org/official_releases/ SPELL=qtquickcontrols SPELLX=$SPELL-opensource-src - VERSION=5.1.0 - SOURCE_HASH=sha512:b0bb8a3c32d039600451f642f4911da11aea3d057a63765c1a446dbeaf86ec6b5dae9b9e64dc9fe3b46fcd6e02456478fcdec3070b1c77a9d94fff0a4efa3f98 + VERSION=5.1.1 + SOURCE_HASH=sha512:d5afe06465606a65a012b003055a2566b16caa77328f77c4ce5b713d94dde04744093ef8894cc0c58741320427815abcebed7d7694f3ff8cbcfe64d99de25261 SOURCE=$SPELLX-$VERSION.tar.xz SOURCE_URL=$QT_URL/qt/${VERSION%.?}/$VERSION/submodules/$SOURCE SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-$VERSION diff --git a/qt5/qtquickcontrols/HISTORY b/qt5/qtquickcontrols/HISTORY index 949a0bca1b..d6180581f5 100644 --- a/qt5/qtquickcontrols/HISTORY +++ b/qt5/qtquickcontrols/HISTORY @@ -1,3 +1,6 @@ +2013-09-03 Treeve Jelbert <treeve@sourcemage.org> + * DETAILS: version 5.1.1 + 2013-07-09 Treeve Jelbert <treeve@sourcemage.org> * DETAILS: version 5.1.0 new spell, for modular qt diff --git a/qt5/qtscript/DETAILS b/qt5/qtscript/DETAILS index c3c29916b9..4965f33a09 100755 --- a/qt5/qtscript/DETAILS +++ b/qt5/qtscript/DETAILS @@ -1,8 +1,8 @@ QT_URL=http://download.qt-project.org/official_releases/ SPELL=qtscript SPELLX=$SPELL-opensource-src - VERSION=5.1.0 - SOURCE_HASH=sha512:226a8b56646a3c62ef1eaa122e45e42594321e0570f8d70398dcbc7a2ea10e22cd1435d4d010b3ca10c1305b91f627da902946ccccd4e5f2b5bd9dcaf2b639b3 + VERSION=5.1.1 + SOURCE_HASH=sha512:0435cd4fbbda6b14c750c563368658b781be0f8d73e88c290aae08ac0445ae6a8807765e30d1f2527b06a51ef95bc4f46dcbcead874f8930718ddab53b6ea632 SOURCE=$SPELLX-$VERSION.tar.xz SOURCE_URL=$QT_URL/qt/${VERSION%.?}/$VERSION/submodules/$SOURCE SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-$VERSION diff --git a/qt5/qtscript/HISTORY b/qt5/qtscript/HISTORY index d20d3529a2..254ecd5957 100644 --- a/qt5/qtscript/HISTORY +++ b/qt5/qtscript/HISTORY @@ -1,3 +1,6 @@ +2013-09-03 Treeve Jelbert <treeve@sourcemage.org> + * DETAILS: version 5.1.1 + 2013-07-07 Treeve Jelbert <treeve@sourcemage.org> * DETAILS: version 5.1.0 diff --git a/qt5/qtsvg/DETAILS b/qt5/qtsvg/DETAILS index 96ae580a3b..fb7fea1fb6 100755 --- a/qt5/qtsvg/DETAILS +++ b/qt5/qtsvg/DETAILS @@ -1,8 +1,8 @@ QT_URL=http://download.qt-project.org/official_releases/ SPELL=qtsvg SPELLX=$SPELL-opensource-src - VERSION=5.1.0 - SOURCE_HASH=sha512:1e620efac65f0404eab00863180cab2ff8aafb849dd2a0a97c79383adf0bd3cddbf3dbed47e01ba47187b3a7fe1ca714341a23327adea333185c74b9f914c078 + VERSION=5.1.1 + SOURCE_HASH=sha512:c6faa5e0e0815180e6183fd71caa19973d08707d729b83d269bedcfe62d9eaa1634d71a390ad11b3665601ec0d39b08728b0d14d07552fe7d7b81b9d930aa5b6 SOURCE=$SPELLX-$VERSION.tar.xz SOURCE_URL=$QT_URL/qt/${VERSION%.?}/$VERSION/submodules/$SOURCE SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-$VERSION diff --git a/qt5/qtsvg/HISTORY b/qt5/qtsvg/HISTORY index d20d3529a2..254ecd5957 100644 --- a/qt5/qtsvg/HISTORY +++ b/qt5/qtsvg/HISTORY @@ -1,3 +1,6 @@ +2013-09-03 Treeve Jelbert <treeve@sourcemage.org> + * DETAILS: version 5.1.1 + 2013-07-07 Treeve Jelbert <treeve@sourcemage.org> * DETAILS: version 5.1.0 diff --git a/qt5/qttools/DETAILS b/qt5/qttools/DETAILS index a65ebc2af2..6404bb49f7 100755 --- a/qt5/qttools/DETAILS +++ b/qt5/qttools/DETAILS @@ -1,8 +1,8 @@ QT_URL=http://download.qt-project.org/official_releases/ SPELL=qttools SPELLX=$SPELL-opensource-src - VERSION=5.1.0 - SOURCE_HASH=sha512:63f4ec5551e07afab0b8d0113c0e214a4370a0186190fa324205f4088feeda24c4286c783eed6875ab0da066bf8d73af14f1b1462df39adbbdde56ba001aafdf + VERSION=5.1.1 + SOURCE_HASH=sha512:9fdd3063357fc961c972e50f61e7b9b028e72dfca27830bd0316a02ca7898ce98e4170b4687d511aa12cd1c77aac6ac8900374f6bab28846a484dd9acbed6565 SOURCE=$SPELLX-$VERSION.tar.xz SOURCE_URL=$QT_URL/qt/${VERSION%.?}/$VERSION/submodules/$SOURCE SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-$VERSION diff --git a/qt5/qttools/HISTORY b/qt5/qttools/HISTORY index 3e0cbaa3f2..03597d736d 100644 --- a/qt5/qttools/HISTORY +++ b/qt5/qttools/HISTORY @@ -1,4 +1,7 @@ -2013-0707 Treeve Jelbert <treeve@sourcemage.org> +2013-09-03 Treeve Jelbert <treeve@sourcemage.org> + * DETAILS: version 5.1.1 + +2013-07-07 Treeve Jelbert <treeve@sourcemage.org> * DETAILS: version 5.1.0 2013-02-12 Treeve Jelbert <treeve@sourcemage.org> diff --git a/qt5/qtwebkit5/DETAILS b/qt5/qtwebkit5/DETAILS index c096fcc63f..d7a081d9c7 100755 --- a/qt5/qtwebkit5/DETAILS +++ b/qt5/qtwebkit5/DETAILS @@ -1,8 +1,8 @@ QT_URL=http://download.qt-project.org/official_releases/ SPELL=qtwebkit5 SPELLX=${SPELL/5}-opensource-src - VERSION=5.1.0 - SOURCE_HASH=sha512:fc1becd431ab7dbfb5146cdc5de8abc3d57362278b77df4e6678551bf29c927501d39d1472d7973cf7f8c3497eff4cc926b65191a1ac6960a23cd803e36d8d4c + VERSION=5.1.1 + SOURCE_HASH=sha512:aa7e310f1319902131dab5705a5bb2c02252f0d3d6b288ab13478ae42d38664578c52708cf3fa504ffc0b1f9f161e5bbcc65bdf6a7028c043b992211986a5f64 SOURCE=$SPELLX-$VERSION.tar.xz SOURCE_URL=$QT_URL/qt/${VERSION%.?}/$VERSION/submodules/$SOURCE SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-$VERSION diff --git a/qt5/qtwebkit5/HISTORY b/qt5/qtwebkit5/HISTORY index cca30beb6a..c30f9f8139 100644 --- a/qt5/qtwebkit5/HISTORY +++ b/qt5/qtwebkit5/HISTORY @@ -1,3 +1,6 @@ +2013-09-03 Treeve Jelbert <treeve@sourcemage.org> + * DETAILS: version 5.1.1 + 2013-07-09 Treeve Jelbert <treeve@sourcemage.org> * DETAILS: version 5.1.0 diff --git a/qt5/qtx11extras/DETAILS b/qt5/qtx11extras/DETAILS index dade371372..13f2f5dec8 100755 --- a/qt5/qtx11extras/DETAILS +++ b/qt5/qtx11extras/DETAILS @@ -1,8 +1,8 @@ QT_URL=http://download.qt-project.org/official_releases SPELL=qtx11extras SPELLX=$SPELL-opensource-src - VERSION=5.1.0 - SOURCE_HASH=sha512:0f370a5427fd45f25d019b2eba397b5509238e4cc1372cfc88cb26317f51d51452326a2f2c26fe654c5d8b66c7225eae228c3d5b24735ca8de986a7f3911fc18 + VERSION=5.1.1 + SOURCE_HASH=sha512:63b0ca30f7c8acd957857825121739c353bd1c03e5546f20128112b3877badd9f1804e261c03224e08e9caa63ba071d7706da9211642114124727b6f4a6c204b SOURCE=$SPELLX-$VERSION.tar.xz SOURCE_URL=$QT_URL/qt/${VERSION%.?}/$VERSION/submodules/$SOURCE SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-$VERSION diff --git a/qt5/qtx11extras/HISTORY b/qt5/qtx11extras/HISTORY index 9f46401a07..99af3cd563 100644 --- a/qt5/qtx11extras/HISTORY +++ b/qt5/qtx11extras/HISTORY @@ -1,3 +1,6 @@ +2013-09-03 Treeve Jelbert <treeve@sourcemage.org> + * DETAILS: version 5.1.1 + 2013-07-09 Treeve Jelbert <treeve@sourcemage.org> * DETAILS: version 5.1.0 new spell, for modular qt5 diff --git a/qt5/qtxmlpatterns/DETAILS b/qt5/qtxmlpatterns/DETAILS index 54459f9627..f965b0811a 100755 --- a/qt5/qtxmlpatterns/DETAILS +++ b/qt5/qtxmlpatterns/DETAILS @@ -1,8 +1,8 @@ QT_URL=http://download.qt-project.org/official_releases/ SPELL=qtxmlpatterns SPELLX=$SPELL-opensource-src - VERSION=5.1.0 - SOURCE_HASH=sha512:5805bd3ec8fe943e53b87d432cf0b2b00744af5c0d1f91382b17195afa5d8c958aa8667ee7013d5f25c9de11cb92b7d030c4400131742689d681a0c0bf21c0b2 + VERSION=5.1.1 + SOURCE_HASH=sha512:53387ea9d4c6e72febf1156872506f89662c6b2793f6d39f88005c12b613fe83922e052bfdb12f8bc394e67811a97f806efaa371d9bdf715ad8f1435c6bcd106 SOURCE=$SPELLX-$VERSION.tar.xz SOURCE_URL=$QT_URL/qt/${VERSION%.?}/$VERSION/submodules/$SOURCE SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-$VERSION diff --git a/qt5/qtxmlpatterns/HISTORY b/qt5/qtxmlpatterns/HISTORY index 35559851fe..d78d4c476d 100644 --- a/qt5/qtxmlpatterns/HISTORY +++ b/qt5/qtxmlpatterns/HISTORY @@ -1,3 +1,6 @@ +2013-09-03 Treeve Jelbert <treeve@sourcemage.org> + * DETAILS: version 5.1.1 + 2013-07-07 Treeve Jelbert <treeve@sourcemage.org> * DETAILS: version 5.1.o diff --git a/utils/qemu/DEPENDS b/utils/qemu/DEPENDS index 529a9a9788..13283cb611 100755 --- a/utils/qemu/DEPENDS +++ b/utils/qemu/DEPENDS @@ -69,6 +69,11 @@ optional_depends libusbx \ '--disable-libusb' \ 'for USB pass-through support' && +optional_depends nss \ + '--enable-smartcard-nss' \ + '--disable-smartcard-nss' \ + 'for SmartCard NSS support' && + if [[ "x$QEMU_VNC" == "x--enable-vnc" ]]; then suggest_depends gnutls \ "--enable-vnc-tls" \ diff --git a/utils/qemu/HISTORY b/utils/qemu/HISTORY index b4341e4154..cfd6f3dfc2 100644 --- a/utils/qemu/HISTORY +++ b/utils/qemu/HISTORY @@ -1,3 +1,7 @@ +2013-09-04 Eric Sandall <sandalle@sourcemage.org> + * DEPENDS: Optionally depends on nss + * *SUB_DEPENDS: Allow forcing dependency on nss + 2013-08-13 Eric Sandall <sandalle@sourcemage.org> * DETAILS: Updated to 1.5.2 * CONFIGURE: sb16, cs4231a, adlib, and gus sound cards removed diff --git a/utils/qemu/PRE_SUB_DEPENDS b/utils/qemu/PRE_SUB_DEPENDS new file mode 100755 index 0000000000..c19df5692b --- /dev/null +++ b/utils/qemu/PRE_SUB_DEPENDS @@ -0,0 +1,6 @@ +case $THIS_SUB_DEPENDS in + NSS) is_depends_enabled $SPELL nss && return 0;; + *) echo "unknown sub_depends!" ;; +esac +return 1 + diff --git a/utils/qemu/REPAIR^none^PRE_SUB_DEPENDS b/utils/qemu/REPAIR^none^PRE_SUB_DEPENDS new file mode 100755 index 0000000000..c19df5692b --- /dev/null +++ b/utils/qemu/REPAIR^none^PRE_SUB_DEPENDS @@ -0,0 +1,6 @@ +case $THIS_SUB_DEPENDS in + NSS) is_depends_enabled $SPELL nss && return 0;; + *) echo "unknown sub_depends!" ;; +esac +return 1 + diff --git a/utils/qemu/SUB_DEPENDS b/utils/qemu/SUB_DEPENDS new file mode 100755 index 0000000000..75b63abcd5 --- /dev/null +++ b/utils/qemu/SUB_DEPENDS @@ -0,0 +1,6 @@ +case $THIS_SUB_DEPENDS in + NSS) echo "nss support requested, forcing nss dependency." && + depends nss '--enable-smartcard-nss' + ;; + *) echo "unknown sub_depends $THIS_SUB_DEPENDS"; return 1 ;; +esac diff --git a/utils/spice-gtk/DEPENDS b/utils/spice-gtk/DEPENDS index 97fc9a1b67..479d3155dc 100755 --- a/utils/spice-gtk/DEPENDS +++ b/utils/spice-gtk/DEPENDS @@ -50,4 +50,19 @@ optional_depends PYTHON \ optional_depends 'vala' \ '--enable-vala' \ '--disable-vala' \ - 'for Vala language support' + 'for Vala language support' && + +message "${MESSAGE_COLOR}It is recommended to NOT enable the" \ + "smartcard support via qemu or there will be a circular" \ + "dependency between qemu and spice${DEFAULT_COLOR}" && + +optional_depends qemu \ + '--enable-smartcard' \ + '--disable-smartcard' \ + 'for smartcard support' && + +if is_depends_enabled $SPELL qemu; then + depends -sub 'NSS' qemu +fi && + +suggest_depends -sub "GTK${SPICE_GTK_VER} SPICE" 'virt-viewer' '' '' 'for a better spice client' diff --git a/utils/spice-gtk/HISTORY b/utils/spice-gtk/HISTORY index f781dcf69a..d24b7f3063 100644 --- a/utils/spice-gtk/HISTORY +++ b/utils/spice-gtk/HISTORY @@ -1,3 +1,9 @@ +2013-09-04 Eric Sandall <sandalle@sourcemage.org> + * DEPENDS: Suggest virt-viewer for a better spice client + See http://spice-space.org/download.html + Make sure virt-viewer uses spice and the same GTK as spice-gtk + Optionally depend on qemu with nss for smart cards + 2013-08-12 Eric Sandall <sandalle@sourcemage.org> * Created diff --git a/utils/spice/DEPENDS b/utils/spice/DEPENDS index 994f9f686a..7e7f82c317 100755 --- a/utils/spice/DEPENDS +++ b/utils/spice/DEPENDS @@ -1,6 +1,5 @@ depends alsa-lib && depends celt051 && -depends qemu && depends cairo && depends pixman && depends spice-protocol && @@ -12,7 +11,30 @@ depends libxext && depends libxrender && depends pyparsing && -optional_depends OPENGL \ - "--enable-opengl" \ - "--disable-opengl" \ - "for OpenGL video output" +optional_depends LIBSASL \ + '--with-sasl' \ + '--without-sasl' \ + 'for Cyrus SASL authentication' && + +optional_depends libxinerama \ + '--enable-xinerama' \ + '--disable-xinerama' \ + 'for multi-monitor support via Xinerama' && + +optional_depends OPENGL \ + "--enable-client --enable-opengl" \ + "--disable-client --disable-opengl" \ + "for OpenGL video output" && + +message "${MESSAGE_COLOR}It is recommended to NOT enable the" \ + "smartcard support via qemu or there will be a circular" \ + "dependency between qemu and spice${DEFAULT_COLOR}" && + +optional_depends qemu \ + '--enable-smartcard' \ + '--disable-smartcard' \ + 'for smartcard support' && + +if is_depends_enabled $SPELL qemu; then + depends -sub 'NSS' qemu +fi diff --git a/utils/spice/HISTORY b/utils/spice/HISTORY index ee7b0491d7..5a17d19838 100644 --- a/utils/spice/HISTORY +++ b/utils/spice/HISTORY @@ -1,3 +1,9 @@ +2013-09-04 Eric Sandall <sandalle@sourcemage.org> + * DEPENDS: Optionally depends on qemu built with nss support + Optionally depends on LIBSASL + OPENGL optional dependency is for the spice client + Optionally depends on libxinerama + 2013-08-12 Eric Sandall <sandalle@sourcemage.org> * DETAILS: Updated to 0.12.4 * DEPENDS: Depends on pyparsing diff --git a/x11/gtk-vnc/CONFIGURE b/x11/gtk-vnc/CONFIGURE index 1e44014a7c..40b40124d9 100755 --- a/x11/gtk-vnc/CONFIGURE +++ b/x11/gtk-vnc/CONFIGURE @@ -1,2 +1,5 @@ config_query_option GTK_VNC_EXAMPLES 'Install example programs?' n \ - '--with-examples' '--without-examples' + '--with-examples' '--without-examples' && + +config_query_list GTK_VNC_VER 'Which GTK version (RECOMMEND 3)' \ + 3 2 diff --git a/x11/gtk-vnc/DEPENDS b/x11/gtk-vnc/DEPENDS index 0a05090538..a73685c92a 100755 --- a/x11/gtk-vnc/DEPENDS +++ b/x11/gtk-vnc/DEPENDS @@ -1,4 +1,5 @@ depends gnutls && +depends gtk+${GTK_VNC_VER} "--with-gtk=${GTK_VNC_VER}.0" && depends -sub VAPIGEN vala && optional_depends gettext \ @@ -30,4 +31,10 @@ optional_depends gobject-introspection \ optional_depends pulseaudio \ '--with-pulseaudio' \ '--without-pulseaudio' \ - 'for PulseAudio audio playback' + 'for PulseAudio audio playback' && + +if is_depends_enabled $SPELL gtk+2; then + suggest_depends -sub "GTK2 VNC" 'virt-viewer' '' '' 'for a better spice client' +else + suggest_depends -sub "GTK3 VNC" 'virt-viewer' '' '' 'for a better spice client' +fi diff --git a/x11/gtk-vnc/HISTORY b/x11/gtk-vnc/HISTORY index a57c5543be..77275d241f 100644 --- a/x11/gtk-vnc/HISTORY +++ b/x11/gtk-vnc/HISTORY @@ -1,3 +1,7 @@ +2013-09-04 Eric Sandall <sandalle@sourcemage.org> + * DEPENDS: Suggest virt-viewer with appropriate gtk + * Allow for building gtk-vnc without an external entity enforcing gtk+2|3 + 2012-10-16 Eric Sandall <sandalle@sourcemage.org> * DETAILS: Updated to 0.5.1 SOURCE matches upstream SHA256 diff --git a/x11/gtk-vnc/PRE_SUB_DEPENDS b/x11/gtk-vnc/PRE_SUB_DEPENDS index 241941fd42..0f2f0badbd 100755 --- a/x11/gtk-vnc/PRE_SUB_DEPENDS +++ b/x11/gtk-vnc/PRE_SUB_DEPENDS @@ -1,8 +1,12 @@ case $THIS_SUB_DEPENDS in PYTHON) is_depends_enabled $SPELL python && is_depends_enabled $SPELL gtk+2 && return 0 ;; - GTK2) is_depends_enabled $SPELL gtk+2 && return 0 ;; - GTK3) is_depends_enabled $SPELL gtk+3 && return 0 ;; + GTK2) is_depends_enabled $SPELL gtk+2 && + [[ "x${GTK_VNC_VER}" == "x2" ]] && + return 0 ;; + GTK3) is_depends_enabled $SPELL gtk+3 && + [[ "x${GTK_VNC_VER}" == "x3" ]] && + return 0 ;; esac return 1 diff --git a/x11/gtk-vnc/REPAIR^45fd74954c6d20e34ccd7d3041198c4e^PRE_SUB_DEPENDS b/x11/gtk-vnc/REPAIR^45fd74954c6d20e34ccd7d3041198c4e^PRE_SUB_DEPENDS new file mode 100755 index 0000000000..241941fd42 --- /dev/null +++ b/x11/gtk-vnc/REPAIR^45fd74954c6d20e34ccd7d3041198c4e^PRE_SUB_DEPENDS @@ -0,0 +1,8 @@ +case $THIS_SUB_DEPENDS in + PYTHON) is_depends_enabled $SPELL python && + is_depends_enabled $SPELL gtk+2 && return 0 ;; + GTK2) is_depends_enabled $SPELL gtk+2 && return 0 ;; + GTK3) is_depends_enabled $SPELL gtk+3 && return 0 ;; +esac + +return 1 diff --git a/x11/gtk-vnc/SUB_DEPENDS b/x11/gtk-vnc/SUB_DEPENDS index e9d41db01e..fd0d96b984 100755 --- a/x11/gtk-vnc/SUB_DEPENDS +++ b/x11/gtk-vnc/SUB_DEPENDS @@ -4,9 +4,11 @@ case $THIS_SUB_DEPENDS in depends gtk+2 '--with-gtk=2.0' ;; GTK2) echo "gtk+2 bindings requested, forcing them." && + GTK_VNC_VER=2 depends gtk+2 '--with-gtk=2.0' ;; GTK3) echo "gtk+3 bindings requested, forcing them." && + GTK_VNC_VER=3 depends gtk+3 '--with-gtk=3.0' ;; *) echo "unknown sub-depends!" diff --git a/x11/virt-viewer/CONFIGURE b/x11/virt-viewer/CONFIGURE new file mode 100755 index 0000000000..0c7d84d31d --- /dev/null +++ b/x11/virt-viewer/CONFIGURE @@ -0,0 +1,2 @@ +config_query_list VIRT_VIEWER_GUI 'Use which GTK viewer (recommend spice-gtk)?' \ + spice-gtk gtk-vnc diff --git a/x11/virt-viewer/DEPENDS b/x11/virt-viewer/DEPENDS index 7ca551f925..f212e86e3e 100755 --- a/x11/virt-viewer/DEPENDS +++ b/x11/virt-viewer/DEPENDS @@ -1,5 +1,8 @@ -depends gtk+2 && -depends libxml2 && -depends gtk-vnc && -depends libglade2 && -depends libvirt +depends libxml2 && +depends libvirt && + +if [[ "x${VIRT_VIEWER_GUI}" == "xgtk-vnc" ]]; then + depends ${VIRT_VIEWER_GUI} '--without-spice-vnc' +else + depends ${VIRT_VIEWER_GUI} '--without-gtk-vnc' +fi diff --git a/x11/virt-viewer/HISTORY b/x11/virt-viewer/HISTORY index 1b98ef5271..9ad7a231e3 100644 --- a/x11/virt-viewer/HISTORY +++ b/x11/virt-viewer/HISTORY @@ -1,3 +1,6 @@ +2013-09-04 Eric Sandall <sandalle@sourcemage.org> + * Allow for selecting spice-gtk or gtk-vnc, these are exclusive options + 2013-08-12 Eric Sandall <sandalle@sourcemage.org> * DETAILS: Updated to 0.5.7 diff --git a/x11/virt-viewer/PRE_SUB_DEPENDS b/x11/virt-viewer/PRE_SUB_DEPENDS new file mode 100755 index 0000000000..69004515d4 --- /dev/null +++ b/x11/virt-viewer/PRE_SUB_DEPENDS @@ -0,0 +1,8 @@ +case $THIS_SUB_DEPENDS in + SPICE) [[ "x${VIRT_VIEWER_GUI}" == "xspice-gtk" ]] && return 0 ;; + GTK3) is_depends_enabled $SPELL gtk+3 ;; + GTK2) is_depends_enabled $SPELL gtk+2 ;; + VNC) [[ "x${VIRT_VIEWER_GUI}" == "xgtk-vnc" ]] && return 0 ;; + *) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL $THIS_SUB_DEPENDS${DEFAULT_COLOR}" + return 1;; +esac diff --git a/x11/virt-viewer/REPAIR^none^PRE_SUB_DEPENDS b/x11/virt-viewer/REPAIR^none^PRE_SUB_DEPENDS new file mode 100755 index 0000000000..69004515d4 --- /dev/null +++ b/x11/virt-viewer/REPAIR^none^PRE_SUB_DEPENDS @@ -0,0 +1,8 @@ +case $THIS_SUB_DEPENDS in + SPICE) [[ "x${VIRT_VIEWER_GUI}" == "xspice-gtk" ]] && return 0 ;; + GTK3) is_depends_enabled $SPELL gtk+3 ;; + GTK2) is_depends_enabled $SPELL gtk+2 ;; + VNC) [[ "x${VIRT_VIEWER_GUI}" == "xgtk-vnc" ]] && return 0 ;; + *) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL $THIS_SUB_DEPENDS${DEFAULT_COLOR}" + return 1;; +esac diff --git a/x11/virt-viewer/SUB_DEPENDS b/x11/virt-viewer/SUB_DEPENDS new file mode 100755 index 0000000000..16a12fb935 --- /dev/null +++ b/x11/virt-viewer/SUB_DEPENDS @@ -0,0 +1,21 @@ +case $THIS_SUB_DEPENDS in + SPICE) message "spice-gtk requested, forcing enabled spice-gtk dependency" && + persistent_add VIRT_VIEWER_GUI && + VIRT_VIEWER_GUI=spice-gtk + ;; + GTK3) message "gtk+3 requested, forcing enabled gtk+3 dependency" && + VIRT_VIEWER_GTK_VER=3 && + depends gtk+3 '--with-gtk=3.0' + ;; + GTK2) message "gtk+2 requested, forcing enabled gtk+2 dependency" && + VIRT_VIEWER_GTK_VER=2 && + depends gtk+2 '--with-gtk=2.0' + ;; + VNC) message "gtk-vnc requested, forcing enabled gtk-vnc dependency" && + persistent_add VIRT_VIEWER_GUI && + VIRT_VIEWER_GUI=gtk-vnc + ;; + *) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL $THIS_SUB_DEPENDS${DEFAULT_COLOR}" + return 1 + ;; +esac diff --git a/x11/xscreensaver/DEPENDS b/x11/xscreensaver/DEPENDS index acc1eca9a7..7df551f70a 100755 --- a/x11/xscreensaver/DEPENDS +++ b/x11/xscreensaver/DEPENDS @@ -1,6 +1,13 @@ -depends bc && -depends zlib && -depends xorg-libs && +depends bc && +depends libice && +depends libx11 && +depends libxxf86misc && +depends libxxf86vm && +depends libxi && +depends libxmu && +depends libxrender && +depends libxt && +depends zlib && message "${MESSAGE_COLOR}The xscreensaver demo program allows you to" \ "browse among the different effects available in xscreensaver." \ diff --git a/x11/xscreensaver/DETAILS b/x11/xscreensaver/DETAILS index 1e341d4b0b..9c63a210e9 100755 --- a/x11/xscreensaver/DETAILS +++ b/x11/xscreensaver/DETAILS @@ -1,10 +1,11 @@ SPELL=xscreensaver - VERSION=5.20 + VERSION=5.22 SOURCE=$SPELL-$VERSION.tar.gz + SOURCE_GPG="gurus.gpg:${SOURCE}.sig:WORKS_FOR_ME" SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION SOURCE_URL[0]=http://www.jwz.org/$SPELL/$SOURCE WEB_SITE=http://www.jwz.org/xscreensaver/ - SOURCE_HASH=sha512:2867e081154e53c3d7e16bda1226c9682b296461f93b7565cbb0a267ac81489abefd947e0795f04e77632e108f428c7421e14fdd95894297a8a8da375914db74 +# SOURCE_HASH=sha512:2867e081154e53c3d7e16bda1226c9682b296461f93b7565cbb0a267ac81489abefd947e0795f04e77632e108f428c7421e14fdd95894297a8a8da375914db74 ENTERED=20010922 LICENSE[0]=BSD KEYWORDS="x11" diff --git a/x11/xscreensaver/HISTORY b/x11/xscreensaver/HISTORY index af42dc54c1..2600b46040 100644 --- a/x11/xscreensaver/HISTORY +++ b/x11/xscreensaver/HISTORY @@ -1,3 +1,8 @@ +2013-09-06 Eric Sandall <sandalle@sourcemage.org> + * DETAILS: Updated to 5.22 + * DEPENDS: Replaced xorg-libs with libice, libx11, libxxf86misc, libxxf86vm, + libxi, libxmu, libxrender, and libxt + 2012-12-08 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de> * DETAILS: version 5.20 diff --git a/x11/xscreensaver/xscreensaver-5.22.tar.gz.sig b/x11/xscreensaver/xscreensaver-5.22.tar.gz.sig Binary files differnew file mode 100644 index 0000000000..cdb8565ae4 --- /dev/null +++ b/x11/xscreensaver/xscreensaver-5.22.tar.gz.sig diff --git a/xfce/xfce4-profile/DEPENDS b/xfce/xfce4-profile/DEPENDS index d46c7bd8bd..0180d1529b 100755 --- a/xfce/xfce4-profile/DEPENDS +++ b/xfce/xfce4-profile/DEPENDS @@ -1,9 +1,9 @@ -runtime_depends xorg-libs && runtime_depends gtk+2 && runtime_depends libxml2 && runtime_depends libxfce4util && runtime_depends libxfce4menu && runtime_depends libxfcegui4 && +runtime_depends X11-SERVER && runtime_depends xfconf && runtime_depends xfce4-settings && runtime_depends xfdesktop && diff --git a/xfce/xfce4-profile/HISTORY b/xfce/xfce4-profile/HISTORY index 6e595ddf0e..f62e266d8e 100644 --- a/xfce/xfce4-profile/HISTORY +++ b/xfce/xfce4-profile/HISTORY @@ -1,3 +1,6 @@ +2013-09-06 Eric Sandall <sandalle@sourcemage.org> + * DEPENDS: Replaced runtime dependency on xorg-libs with X11-SERVER + 2013-06-14 Eric Sandall <sandalle@sourcemage.org> * DEPENDS: terminal renamed to xfce4-terminal |