diff --git a/asciidoc/.footprint b/asciidoc/.footprint index c2af1739d..4f74ad129 100644 --- a/asciidoc/.footprint +++ b/asciidoc/.footprint @@ -72,6 +72,7 @@ drwxr-xr-x root/root usr/etc/asciidoc/javascripts/ -rw-r--r-- root/root usr/etc/asciidoc/javascripts/asciidoc.js -rw-r--r-- root/root usr/etc/asciidoc/javascripts/slidy.js -rw-r--r-- root/root usr/etc/asciidoc/javascripts/toc.js +-rw-r--r-- root/root usr/etc/asciidoc/lang-cs.conf -rw-r--r-- root/root usr/etc/asciidoc/lang-de.conf -rw-r--r-- root/root usr/etc/asciidoc/lang-el.conf -rw-r--r-- root/root usr/etc/asciidoc/lang-en.conf @@ -81,6 +82,7 @@ drwxr-xr-x root/root usr/etc/asciidoc/javascripts/ -rw-r--r-- root/root usr/etc/asciidoc/lang-it.conf -rw-r--r-- root/root usr/etc/asciidoc/lang-nl.conf -rw-r--r-- root/root usr/etc/asciidoc/lang-pt-BR.conf +-rw-r--r-- root/root usr/etc/asciidoc/lang-ro.conf -rw-r--r-- root/root usr/etc/asciidoc/lang-ru.conf -rw-r--r-- root/root usr/etc/asciidoc/lang-uk.conf -rw-r--r-- root/root usr/etc/asciidoc/latex.conf @@ -98,7 +100,6 @@ drwxr-xr-x root/root usr/etc/asciidoc/themes/flask/ -rw-r--r-- root/root usr/etc/asciidoc/themes/flask/flask.css drwxr-xr-x root/root usr/etc/asciidoc/themes/volnitsky/ -rw-r--r-- root/root usr/etc/asciidoc/themes/volnitsky/volnitsky.css --rw-r--r-- root/root usr/etc/asciidoc/wordpress.conf -rw-r--r-- root/root usr/etc/asciidoc/xhtml11-quirks.conf -rw-r--r-- root/root usr/etc/asciidoc/xhtml11.conf drwxr-xr-x root/root usr/man/ diff --git a/asciidoc/.md5sum b/asciidoc/.md5sum index 56361ee61..35ff7d69c 100644 --- a/asciidoc/.md5sum +++ b/asciidoc/.md5sum @@ -1 +1 @@ -6ffff1ab211f30481741ce4d1e4b12bf asciidoc-8.6.8.tar.gz +c59018f105be8d022714b826b0be130a asciidoc-8.6.9.tar.gz diff --git a/asciidoc/Pkgfile b/asciidoc/Pkgfile index 40583a5e2..6a3524b3a 100644 --- a/asciidoc/Pkgfile +++ b/asciidoc/Pkgfile @@ -5,7 +5,7 @@ # Depends on: python docbook-xml docbook-xsl name=asciidoc -version=8.6.8 +version=8.6.9 release=1 source=(http://downloads.sourceforge.net/project/$name/$name/$version/$name-$version.tar.gz) diff --git a/bind/.md5sum b/bind/.md5sum index 930f7b819..42621473f 100644 --- a/bind/.md5sum +++ b/bind/.md5sum @@ -1,4 +1,4 @@ -e676c65cad5234617ee22f48e328c24e bind-9.9.5.tar.gz +3408af8c6d27d6cb8a05287f2ee32ad0 bind-9.9.5-P1.tar.gz d5ef3bb5ce1020454a2c5996b73c8a5c db.0.0.127 c1e9d24f8ca28d50b5d5ad1637ccf241 db.ip6.arpa 1041493a69a6a5c21d4a513323104a0f db.localhost diff --git a/bind/Pkgfile b/bind/Pkgfile index 5ae7603e0..2793ad655 100644 --- a/bind/Pkgfile +++ b/bind/Pkgfile @@ -5,7 +5,7 @@ # Depends on: name=bind -version=9.9.5 +version=9.9.5-P1 release=1 source=(ftp://ftp.isc.org/isc/bind9/$version/$name-$version.tar.gz \ named.root db.0.0.127 db.localhost db.ip6.arpa named named.conf) diff --git a/ddrescue/.md5sum b/ddrescue/.md5sum index 74b803063..9358c3714 100644 --- a/ddrescue/.md5sum +++ b/ddrescue/.md5sum @@ -1 +1 @@ -564469370fe70cd9ac280b15e1addc50 ddrescue-1.17.tar.lz +c3c745003a0da42ee8b96627af7a9de6 ddrescue-1.18.1.tar.lz diff --git a/ddrescue/Pkgfile b/ddrescue/Pkgfile index f27975e40..6258f6ffd 100644 --- a/ddrescue/Pkgfile +++ b/ddrescue/Pkgfile @@ -4,7 +4,7 @@ # Packager: Danny Rawlins, monster dot romster at gmail dot com name=ddrescue -version=1.17 +version=1.18.1 release=1 source=(http://ftp.gnu.org/gnu/$name/$name-$version.tar.lz) diff --git a/ffmpeg/Pkgfile b/ffmpeg/Pkgfile index 4b8d5a4ba..6dc079223 100644 --- a/ffmpeg/Pkgfile +++ b/ffmpeg/Pkgfile @@ -2,11 +2,11 @@ # URL: http://ffmpeg.org/ # Maintainer: Danny Rawlins, monster dot romster at gmail dot com # Packager: Matt Housh, jaeger at crux dot nu -# Depends on: gnutls imlib2 lame libass libbluray libmodplug libsdl libtheora libva libvdpau libxvid opencore-amr opus rtmpdump schroedinger speex x264 openjpeg +# Depends on: gnutls imlib2 lame libass libbluray libmodplug libsdl libtheora libva libvdpau libxvid opencore-amr opus rtmpdump schroedinger speex x264 openjpeg libvpx name=ffmpeg version=2.2.2 -release=1 +release=2 source=(http://ffmpeg.org/releases/$name-$version.tar.bz2) build() { @@ -38,6 +38,7 @@ build() { --enable-libtheora \ --enable-libvorbis \ --enable-libx264 \ + --enable-libvpx \ --enable-libxvid \ --enable-pic \ --enable-postproc \ diff --git a/inkscape/.md5sum b/inkscape/.md5sum index 11557c63e..ccc52ccd7 100644 --- a/inkscape/.md5sum +++ b/inkscape/.md5sum @@ -1,2 +1,9 @@ +55b040d5e19cb9d58d3d5e975d9f5bac inkscape-0.48.0-spell.patch +c39ce62a9808ef4128f9766574fabb83 inkscape-0.48.3.1-desktop.patch +b0d0907c7b7673f0e6d6de6f30899bc6 inkscape-0.48.4-automake-1.13.patch +e35111b11fede1922869a5518bd16aea inkscape-0.48.4-fix-member-decl.patch +a05f3be80d68d57d5193120ac94e69c5 inkscape-0.48.4-freetype251.patch +9297a94fa1a076c34713d4585989d601 inkscape-0.48.4-gc74-configure.patch +19c6ba7677067a5d8cc20a4baa137be3 inkscape-0.48.4-gc74.patch +07971e05886f55b9e36eb254e57fcbdf inkscape-0.48.4-poppler26.patch 47bd8546e42ba396624eef9eb66b9b6c inkscape-0.48.4.tar.bz2 -e4d948afab6fb5128b41ba78934cca6b spuriouscomma.patch diff --git a/inkscape/Pkgfile b/inkscape/Pkgfile index ad070ea56..08a11b2eb 100644 --- a/inkscape/Pkgfile +++ b/inkscape/Pkgfile @@ -6,14 +6,28 @@ name=inkscape version=0.48.4 -release=1 +release=2 source=(http://downloads.sourceforge.net/project/$name/$name/$version/$name-$version.tar.bz2 - spuriouscomma.patch) + $name-0.48.0-spell.patch + $name-0.48.3.1-desktop.patch + $name-0.48.4-fix-member-decl.patch + $name-0.48.4-automake-1.13.patch + $name-$version-gc74-configure.patch + $name-$version-gc74.patch + $name-$version-freetype251.patch + $name-$version-poppler26.patch) build() { cd $name-$version - patch -p0 -i $SRC/spuriouscomma.patch + patch -p1 -i $SRC/$name-0.48.0-spell.patch + patch -p1 -i $SRC/$name-0.48.3.1-desktop.patch + patch -p1 -i $SRC/$name-0.48.4-fix-member-decl.patch + patch -p1 -i $SRC/$name-0.48.4-automake-1.13.patch + patch -p1 -i $SRC/$name-$version-gc74-configure.patch + patch -p1 -i $SRC/$name-$version-gc74.patch + patch -p0 -i $SRC/$name-$version-freetype251.patch + patch -p1 -i $SRC/$name-$version-poppler26.patch ./configure \ --prefix=/usr \ diff --git a/inkscape/inkscape-0.48.0-spell.patch b/inkscape/inkscape-0.48.0-spell.patch new file mode 100644 index 000000000..946222276 --- /dev/null +++ b/inkscape/inkscape-0.48.0-spell.patch @@ -0,0 +1,45 @@ +--- inkscape-0.48.0/configure.ac.orig 2010-10-26 21:22:06.000000000 +0200 ++++ inkscape-0.48.0/configure.ac 2010-10-26 21:33:39.000000000 +0200 +@@ -433,10 +433,15 @@ + fi + AM_CONDITIONAL(INKJAR, test "$with_ij" = "yes") + ++AC_ARG_WITH([gtkspell], ++ AS_HELP_STRING([--without-gtkspell], [disable gtk spelling widget]),[with_gtkspell=$withval], [with_gtkspell=yes]) ++ + ink_spell_pkg= +-if pkg-config --exists gtkspell-2.0; then +- ink_spell_pkg=gtkspell-2.0 +- AC_DEFINE(WITH_GTKSPELL, 1, [enable gtk spelling widget]) ++if test "x$with_gtkspell" = "xyes"; then ++ if pkg-config --exists gtkspell-2.0; then ++ ink_spell_pkg=gtkspell-2.0 ++ AC_DEFINE(WITH_GTKSPELL, 1, [enable gtk spelling widget]) ++ fi + fi + + dnl ****************************** +@@ -758,12 +763,17 @@ + dnl ************************** + dnl Check for aspell + dnl ****************************** +-AC_CHECK_LIB(aspell, new_aspell_config, [AC_CHECK_HEADER(aspell.h, aspell_ok=yes, aspell_ok=no)], aspell_ok=no, -lz -lm) +-if test "x$aspell_ok" = "xyes"; then +- AC_DEFINE(HAVE_ASPELL, 1, [Use aspell for built-in spellchecker]) +- INKSCAPE_LIBS="$INKSCAPE_LIBS -laspell" +-else +- AC_MSG_CHECKING([Aspell not found, spell checker will be disabled]) ++AC_ARG_WITH([aspell], ++ AS_HELP_STRING([--without-aspell], [disable aspell spell checker]),[with_aspell=$withval], [with_aspell=yes]) ++ ++if test "x$with_aspell" = "xyes"; then ++ AC_CHECK_LIB(aspell, new_aspell_config, [AC_CHECK_HEADER(aspell.h, aspell_ok=yes, aspell_ok=no)], aspell_ok=no, -lz -lm) ++ if test "x$aspell_ok" = "xyes"; then ++ AC_DEFINE(HAVE_ASPELL, 1, [Use aspell for built-in spellchecker]) ++ INKSCAPE_LIBS="$INKSCAPE_LIBS -laspell" ++ else ++ AC_MSG_CHECKING([Aspell not found, spell checker will be disabled]) ++ fi + fi + + dnl Check for bind_textdomain_codeset, including -lintl if GLib brings it in. diff --git a/inkscape/inkscape-0.48.1-libpng15.patch b/inkscape/inkscape-0.48.1-libpng15.patch new file mode 100644 index 000000000..e24913ed6 --- /dev/null +++ b/inkscape/inkscape-0.48.1-libpng15.patch @@ -0,0 +1,40 @@ +--- inkscape-0.48.1/src/extension/internal/pdfinput/svg-builder.cpp ++++ inkscape-0.48.1-mod//src/extension/internal/pdfinput/svg-builder.cpp +@@ -1443,7 +1443,7 @@ + return NULL; + } + // Set error handler +- if (setjmp(png_ptr->jmpbuf)) { ++ if (setjmp(png_jmpbuf(png_ptr))) { + png_destroy_write_struct(&png_ptr, &info_ptr); + return NULL; + } +--- inkscape-0.48.1/src/helper/png-write.cpp ++++ inkscape-0.48.1-mod//src/helper/png-write.cpp +@@ -165,7 +165,7 @@ + /* Set error handling. REQUIRED if you aren't supplying your own + * error hadnling functions in the png_create_write_struct() call. + */ +- if (setjmp(png_ptr->jmpbuf)) { ++ if (setjmp(png_jmpbuf(png_ptr))) { + /* If we get here, we had a problem reading the file */ + fclose(fp); + png_destroy_write_struct(&png_ptr, &info_ptr); +--- inkscape-0.48.1/src/sp-image.cpp ++++ inkscape-0.48.1-mod//src/sp-image.cpp +@@ -386,9 +386,13 @@ + + #if defined(PNG_iCCP_SUPPORTED) + { +- char* name = 0; ++ png_charp name = 0; + int compression_type = 0; +- char* profile = 0; ++#if (PNG_LIBPNG_VER < 10500) ++ png_charp profile = 0; ++#else ++ png_bytep profile = 0; ++#endif + png_uint_32 proflen = 0; + if ( png_get_iCCP(pngPtr, infoPtr, &name, &compression_type, &profile, &proflen) ) { + // g_message("Found an iCCP chunk named [%s] with %d bytes and comp %d", name, proflen, compression_type); diff --git a/inkscape/inkscape-0.48.3.1-desktop.patch b/inkscape/inkscape-0.48.3.1-desktop.patch new file mode 100644 index 000000000..ea5f214ca --- /dev/null +++ b/inkscape/inkscape-0.48.3.1-desktop.patch @@ -0,0 +1,11 @@ +--- inkscape-0.48.3.1/inkscape.desktop.in ++++ inkscape-0.48.3.1/inkscape.desktop.in +@@ -5,7 +5,7 @@ + _X-GNOME-FullName=Inkscape Vector Graphics Editor + _Comment=Create and edit Scalable Vector Graphics images + Type=Application +-Categories=Graphics;VectorGraphics;GTK; ++Categories=Graphics;2DGraphics;VectorGraphics;GTK; + MimeType=image/svg+xml;image/svg+xml-compressed;application/vnd.corel-draw;application/pdf;application/postscript;image/x-eps;application/illustrator; + Exec=inkscape %F + TryExec=inkscape diff --git a/inkscape/inkscape-0.48.4-automake-1.13.patch b/inkscape/inkscape-0.48.4-automake-1.13.patch new file mode 100644 index 000000000..6d649da99 --- /dev/null +++ b/inkscape/inkscape-0.48.4-automake-1.13.patch @@ -0,0 +1,21 @@ +From: Julian Ospald +Date: Thu Apr 25 15:06:01 UTC 2013 +Subject: fix building with automake-1.3 + +--- inkscape-0.48.4/configure.ac ++++ inkscape-0.48.4/configure.ac +@@ -21,12 +21,12 @@ + export CC CXX + ]) + +-AM_CONFIG_HEADER(config.h) ++AC_CONFIG_HEADERS(config.h) + + AC_LANG(C++) + AC_ISC_POSIX + AC_PROG_CXX +-AM_PROG_CC_STDC ++AC_PROG_CC + AM_PROG_AS + AC_PROG_RANLIB + AC_PROG_INTLTOOL(0.22) diff --git a/inkscape/spuriouscomma.patch b/inkscape/inkscape-0.48.4-fix-member-decl.patch similarity index 63% rename from inkscape/spuriouscomma.patch rename to inkscape/inkscape-0.48.4-fix-member-decl.patch index bc538068f..993dfdaf9 100644 --- a/inkscape/spuriouscomma.patch +++ b/inkscape/inkscape-0.48.4-fix-member-decl.patch @@ -1,5 +1,5 @@ ---- src/widgets/desktop-widget.h~ 2011-07-08 13:25:09.000000000 -0500 -+++ src/widgets/desktop-widget.h 2013-02-15 16:04:45.806910365 -0600 +--- inkscape-0.48.4/src/widgets/desktop-widget.h ++++ inkscape-0.48.4/src/widgets/desktop-widget.h @@ -239,7 +239,7 @@ private: GtkWidget *tool_toolbox; diff --git a/inkscape/inkscape-0.48.4-freetype251.patch b/inkscape/inkscape-0.48.4-freetype251.patch new file mode 100644 index 000000000..0142a476a --- /dev/null +++ b/inkscape/inkscape-0.48.4-freetype251.patch @@ -0,0 +1,14 @@ +=== modified file 'src/libnrtype/FontFactory.h' +--- src/libnrtype/FontFactory.h 2010-04-15 19:00:11 +0000 ++++ src/libnrtype/FontFactory.h 2013-11-28 05:54:34 +0000 +@@ -31,7 +31,8 @@ + #include + #else + #include +-#include ++#include ++#include FT_FREETYPE_H + #endif + + namespace Glib + diff --git a/inkscape/inkscape-0.48.4-gc74-configure.patch b/inkscape/inkscape-0.48.4-gc74-configure.patch new file mode 100644 index 000000000..3ef7ce2c9 --- /dev/null +++ b/inkscape/inkscape-0.48.4-gc74-configure.patch @@ -0,0 +1,15 @@ +--- inkscape-0.48.4/configure.ac 2013-12-31 00:38:18.592732496 +0400 ++++ inkscape-0.48.4/configure.ac 2013-12-31 00:39:13.558730872 +0400 +@@ -263,7 +263,11 @@ + # include + #endif + #include +- extern unsigned GC_version; ++ #if (GC_VERSION_MAJOR >= 7 && GC_VERSION_MINOR >= 4) ++ unsigned GC_version = GC_get_version(); ++ #else ++ extern unsigned GC_version; ++ #endif + int main(void){ + unsigned min = ((6 << 16) | (4 << 8) | 0); + printf("%d.%d.%d ",GC_version >> 16, (GC_version >> 8) & 0xFF, GC_version & 0xFF); diff --git a/inkscape/inkscape-0.48.4-gc74.patch b/inkscape/inkscape-0.48.4-gc74.patch new file mode 100644 index 000000000..41615ac49 --- /dev/null +++ b/inkscape/inkscape-0.48.4-gc74.patch @@ -0,0 +1,54 @@ +--- inkscape-0.48.4/src/gc-core.h.old 2013-12-31 01:22:38.976653890 +0400 ++++ inkscape-0.48.4/src/gc-core.h 2013-12-31 01:22:48.525653608 +0400 +@@ -57,7 +57,7 @@ + CleanupFunc *old_func, + void **old_data); + int (*general_register_disappearing_link)(void **p_ptr, +- void *base); ++ const void *base); + int (*unregister_disappearing_link)(void **p_ptr); + std::size_t (*get_heap_size)(); + std::size_t (*get_free_bytes)(); +--- inkscape-0.48.4/src/gc.cpp.old 2013-12-31 01:23:50.462651778 +0400 ++++ inkscape-0.48.4/src/gc.cpp 2013-12-31 01:40:37.718622017 +0400 +@@ -70,8 +70,8 @@ + return base + debug_base_fixup(); + } + +-int debug_general_register_disappearing_link(void **p_ptr, void *base) { +- char *real_base=reinterpret_cast(base) - debug_base_fixup(); ++int debug_general_register_disappearing_link(void **p_ptr, const void *base) { ++ char *real_base=const_cast(reinterpret_cast(base)) - debug_base_fixup(); + return GC_general_register_disappearing_link(p_ptr, real_base); + } + +@@ -90,7 +90,7 @@ + } + } + +-int dummy_general_register_disappearing_link(void **, void *) { return false; } ++int dummy_general_register_disappearing_link(void **, const void *) { return false; } + + int dummy_unregister_disappearing_link(void **/*link*/) { return false; } + +@@ -112,7 +112,11 @@ + &GC_malloc_atomic_uncollectable, + &GC_base, + &GC_register_finalizer_ignore_self, ++#if (GC_MAJOR_VERSION >= 7 && GC_MINOR_VERSION >= 4) + &GC_general_register_disappearing_link, ++#else ++ (int (*)(void**, const void*))(&GC_general_register_disappearing_link), ++#endif + &GC_unregister_disappearing_link, + &GC_get_heap_size, + &GC_get_free_bytes, +@@ -202,7 +206,7 @@ + die_because_not_initialized(); + } + +-int stub_general_register_disappearing_link(void **, void *) { ++int stub_general_register_disappearing_link(void **, const void *) { + die_because_not_initialized(); + return 0; + } diff --git a/inkscape/inkscape-0.48.4-poppler26.patch b/inkscape/inkscape-0.48.4-poppler26.patch new file mode 100644 index 000000000..af5189777 --- /dev/null +++ b/inkscape/inkscape-0.48.4-poppler26.patch @@ -0,0 +1,139 @@ +diff -ruN inkscape-0.48.4.orig/src/extension/internal/pdfinput/pdf-parser.cpp inkscape-0.48.4/src/extension/internal/pdfinput/pdf-parser.cpp +--- inkscape-0.48.4.orig/src/extension/internal/pdfinput/pdf-parser.cpp 2012-12-13 18:00:46.726633000 +0100 ++++ inkscape-0.48.4/src/extension/internal/pdfinput/pdf-parser.cpp 2014-05-07 22:50:03.891488716 +0200 +@@ -56,6 +56,11 @@ + #define M_PI 3.14159265358979323846 + #endif + ++#include "poppler-features.h" ++#if POPPLER_CHECK_VERSION(0, 26, 0) ++#define POPPLER_26 ++#endif ++ + //------------------------------------------------------------------------ + // constants + //------------------------------------------------------------------------ +@@ -861,8 +866,12 @@ + isolated = knockout = gFalse; + if (!obj4.dictLookup(const_cast("CS"), &obj5)->isNull()) { + #if defined(POPPLER_NEW_COLOR_SPACE_API) || defined(POPPLER_NEW_ERRORAPI) ++#ifndef POPPLER_26 + blendingColorSpace = GfxColorSpace::parse(&obj5, NULL); + #else ++ blendingColorSpace = GfxColorSpace::parse(&obj5, NULL, NULL); ++#endif ++#else + blendingColorSpace = GfxColorSpace::parse(&obj5); + #endif + } +@@ -1085,9 +1094,17 @@ + res->lookupColorSpace(args[0].getName(), &obj); + #if defined(POPPLER_NEW_COLOR_SPACE_API) || defined(POPPLER_NEW_ERRORAPI) + if (obj.isNull()) { ++#ifndef POPPLER_26 + colorSpace = GfxColorSpace::parse(&args[0], NULL); ++#else ++ colorSpace = GfxColorSpace::parse(&args[0], NULL, NULL); ++#endif + } else { ++#ifndef POPPLER_26 + colorSpace = GfxColorSpace::parse(&obj, NULL); ++#else ++ colorSpace = GfxColorSpace::parse(&obj, NULL, NULL); ++#endif + } + #else + if (obj.isNull()) { +@@ -1120,9 +1137,17 @@ + res->lookupColorSpace(args[0].getName(), &obj); + #if defined(POPPLER_NEW_COLOR_SPACE_API) || defined(POPPLER_NEW_ERRORAPI) + if (obj.isNull()) { ++#ifndef POPPLER_26 + colorSpace = GfxColorSpace::parse(&args[0], NULL); ++#else ++ colorSpace = GfxColorSpace::parse(&args[0], NULL, NULL); ++#endif + } else { ++#ifndef POPPLER_26 + colorSpace = GfxColorSpace::parse(&obj, NULL); ++#else ++ colorSpace = GfxColorSpace::parse(&obj, NULL, NULL); ++#endif + } + #else + if (obj.isNull()) { +@@ -1213,7 +1238,11 @@ + } + #if defined(POPPLER_NEW_COLOR_SPACE_API) || defined(POPPLER_NEW_ERRORAPI) + if (args[numArgs-1].isName() && ++#ifndef POPPLER_26 + (pattern = res->lookupPattern(args[numArgs-1].getName(), NULL))) { ++#else ++ (pattern = res->lookupPattern(args[numArgs-1].getName(), NULL, NULL))) { ++#endif + state->setFillPattern(pattern); + builder->updateStyle(state); + } +@@ -1273,7 +1302,11 @@ + } + #if defined(POPPLER_NEW_COLOR_SPACE_API) || defined(POPPLER_NEW_ERRORAPI) + if (args[numArgs-1].isName() && ++#ifndef POPPLER_26 + (pattern = res->lookupPattern(args[numArgs-1].getName(), NULL))) { ++#else ++ (pattern = res->lookupPattern(args[numArgs-1].getName(), NULL, NULL))) { ++#endif + state->setStrokePattern(pattern); + builder->updateStyle(state); + } +@@ -1711,7 +1744,11 @@ + GBool savedState = gFalse; + + #if defined(POPPLER_NEW_COLOR_SPACE_API) || defined(POPPLER_NEW_ERRORAPI) ++#ifndef POPPLER_26 + if (!(shading = res->lookupShading(args[0].getName(), NULL))) { ++#else ++ if (!(shading = res->lookupShading(args[0].getName(), NULL, NULL))) { ++#endif + return; + } + #else +@@ -2727,8 +2764,12 @@ + } + if (!obj1.isNull()) { + #if defined(POPPLER_NEW_COLOR_SPACE_API) || defined(POPPLER_NEW_ERRORAPI) ++#ifndef POPPLER_26 + colorSpace = GfxColorSpace::parse(&obj1, NULL); + #else ++ colorSpace = GfxColorSpace::parse(&obj1, NULL, NULL); ++#endif ++#else + colorSpace = GfxColorSpace::parse(&obj1); + #endif + } else if (csMode == streamCSDeviceGray) { +@@ -2816,8 +2857,12 @@ + } + } + #if defined(POPPLER_NEW_COLOR_SPACE_API) || defined(POPPLER_NEW_ERRORAPI) ++#ifndef POPPLER_26 + maskColorSpace = GfxColorSpace::parse(&obj1, NULL); + #else ++ maskColorSpace = GfxColorSpace::parse(&obj1, NULL, NULL); ++#endif ++#else + maskColorSpace = GfxColorSpace::parse(&obj1); + #endif + obj1.free(); +@@ -3007,8 +3052,12 @@ + transpGroup = gTrue; + if (!obj1.dictLookup(const_cast("CS"), &obj3)->isNull()) { + #if defined(POPPLER_NEW_COLOR_SPACE_API) || defined(POPPLER_NEW_ERRORAPI) ++#ifndef POPPLER_26 + blendingColorSpace = GfxColorSpace::parse(&obj3, NULL); + #else ++ blendingColorSpace = GfxColorSpace::parse(&obj3, NULL, NULL); ++#endif ++#else + blendingColorSpace = GfxColorSpace::parse(&obj3); + #endif + } diff --git a/libtorrent/.footprint b/libtorrent/.footprint index acf94d496..eac3cf62f 100644 --- a/libtorrent/.footprint +++ b/libtorrent/.footprint @@ -59,17 +59,17 @@ drwxr-xr-x root/root usr/include/torrent/utils/ -rw-r--r-- root/root usr/include/torrent/utils/extents.h -rw-r--r-- root/root usr/include/torrent/utils/log.h -rw-r--r-- root/root usr/include/torrent/utils/log_buffer.h --rw-r--r-- root/root usr/include/torrent/utils/log_files.h -rw-r--r-- root/root usr/include/torrent/utils/net.h -rw-r--r-- root/root usr/include/torrent/utils/option_strings.h -rw-r--r-- root/root usr/include/torrent/utils/ranges.h -rw-r--r-- root/root usr/include/torrent/utils/resume.h -rw-r--r-- root/root usr/include/torrent/utils/signal_bitfield.h -rw-r--r-- root/root usr/include/torrent/utils/thread_base.h +-rw-r--r-- root/root usr/include/torrent/utils/thread_interrupt.h drwxr-xr-x root/root usr/lib/ -rwxr-xr-x root/root usr/lib/libtorrent.la -lrwxrwxrwx root/root usr/lib/libtorrent.so -> libtorrent.so.17.0.4 -lrwxrwxrwx root/root usr/lib/libtorrent.so.17 -> libtorrent.so.17.0.4 --rwxr-xr-x root/root usr/lib/libtorrent.so.17.0.4 +lrwxrwxrwx root/root usr/lib/libtorrent.so -> libtorrent.so.18.0.0 +lrwxrwxrwx root/root usr/lib/libtorrent.so.18 -> libtorrent.so.18.0.0 +-rwxr-xr-x root/root usr/lib/libtorrent.so.18.0.0 drwxr-xr-x root/root usr/lib/pkgconfig/ -rw-r--r-- root/root usr/lib/pkgconfig/libtorrent.pc diff --git a/libtorrent/.md5sum b/libtorrent/.md5sum index f95a5e74d..cbd096d06 100644 --- a/libtorrent/.md5sum +++ b/libtorrent/.md5sum @@ -1 +1 @@ -e94f6c590bb02aaf4d58618f738a85f2 libtorrent-0.13.3.tar.gz +e82f380a9d4b55b379e0e73339c73895 libtorrent-0.13.4.tar.gz diff --git a/libtorrent/Pkgfile b/libtorrent/Pkgfile index 4eee6b70d..7ae916471 100644 --- a/libtorrent/Pkgfile +++ b/libtorrent/Pkgfile @@ -4,8 +4,8 @@ # Depends on: libsigc++ curl name=libtorrent -version=0.13.3 -release=2 +version=0.13.4 +release=1 source=(http://libtorrent.rakshasa.no/downloads/libtorrent-$version.tar.gz) build() { diff --git a/mercurial/.footprint b/mercurial/.footprint index e4abb56b3..45ead5a75 100644 --- a/mercurial/.footprint +++ b/mercurial/.footprint @@ -135,7 +135,7 @@ drwxr-xr-x root/root usr/lib/python2.7/site-packages/hgext/zeroconf/ -rw-r--r-- root/root usr/lib/python2.7/site-packages/hgext/zeroconf/Zeroconf.pyc -rw-r--r-- root/root usr/lib/python2.7/site-packages/hgext/zeroconf/__init__.py -rw-r--r-- root/root usr/lib/python2.7/site-packages/hgext/zeroconf/__init__.pyc --rw-r--r-- root/root usr/lib/python2.7/site-packages/mercurial-3.0-py2.7.egg-info +-rw-r--r-- root/root usr/lib/python2.7/site-packages/mercurial-3.0.1-py2.7.egg-info drwxr-xr-x root/root usr/lib/python2.7/site-packages/mercurial/ -rw-r--r-- root/root usr/lib/python2.7/site-packages/mercurial/__init__.py (EMPTY) -rw-r--r-- root/root usr/lib/python2.7/site-packages/mercurial/__init__.pyc diff --git a/mercurial/.md5sum b/mercurial/.md5sum index 2734f7e5b..34501d3f4 100644 --- a/mercurial/.md5sum +++ b/mercurial/.md5sum @@ -1 +1 @@ -133ff0a31047d2c0b4640943a58535a7 mercurial-3.0.tar.gz +15de301a673b77f839325dba10ed4fc0 mercurial-3.0.1.tar.gz diff --git a/mercurial/Pkgfile b/mercurial/Pkgfile index ee34336e9..9a7cf1a2a 100644 --- a/mercurial/Pkgfile +++ b/mercurial/Pkgfile @@ -5,12 +5,13 @@ # Depends on: python name=mercurial -version=3.0 +version=3.0.1 release=1 source=(http://www.selenic.com/$name/release/$name-$version.tar.gz) build() { cd $name-$version + rm -r i18n /usr/bin/python setup.py install --root=$PKG @@ -18,5 +19,4 @@ build() { install -m 0644 doc/*.1 $PKG/usr/man/man1 install -m 0644 doc/*.5 $PKG/usr/man/man5 - rm -r $PKG/usr/lib/python*/site-packages/mercurial/locale } diff --git a/ncmpc/.md5sum b/ncmpc/.md5sum index 0a067d3d6..e2f5f35b7 100644 --- a/ncmpc/.md5sum +++ b/ncmpc/.md5sum @@ -1 +1 @@ -f26658e84ce08019bf3fe5857f6f4014 ncmpc-0.21.tar.bz2 +b019c4f155f87b852eb59e39d34cbb6b ncmpc-0.22.tar.xz diff --git a/ncmpc/Pkgfile b/ncmpc/Pkgfile index fbcc31bfe..68810fff0 100644 --- a/ncmpc/Pkgfile +++ b/ncmpc/Pkgfile @@ -5,9 +5,9 @@ # Depends on: ncurses libmpdclient name=ncmpc -version=0.21 +version=0.22 release=1 -source=(http://www.musicpd.org/download/ncmpc/0/ncmpc-$version.tar.bz2) +source=(http://www.musicpd.org/download/ncmpc/0/ncmpc-$version.tar.xz) build() { cd $name-$version diff --git a/p5-net-dns/.md5sum b/p5-net-dns/.md5sum index 9d590db5f..9ac086ef9 100644 --- a/p5-net-dns/.md5sum +++ b/p5-net-dns/.md5sum @@ -1 +1 @@ -219dada09d01b7233f82fd1c32ddad39 Net-DNS-0.76.tar.gz +c0744eb8132b069fe712c56bac9c3c47 Net-DNS-0.77.tar.gz diff --git a/p5-net-dns/Pkgfile b/p5-net-dns/Pkgfile index f865657a9..6b907c7ad 100644 --- a/p5-net-dns/Pkgfile +++ b/p5-net-dns/Pkgfile @@ -6,7 +6,7 @@ name=p5-net-dns capsname=Net-DNS -version=0.76 +version=0.77 release=1 source=(http://www.net-dns.org/download/Net-DNS-$version.tar.gz) diff --git a/rtorrent/.md5sum b/rtorrent/.md5sum index 021f0b0e3..019114aab 100644 --- a/rtorrent/.md5sum +++ b/rtorrent/.md5sum @@ -1 +1 @@ -0bf2f262faa8c8c8d3b11ce286ea2bf2 rtorrent-0.9.3.tar.gz +fd9490a2ac67d0fa2a567c6267845876 rtorrent-0.9.4.tar.gz diff --git a/rtorrent/Pkgfile b/rtorrent/Pkgfile index c770d3d03..00a9d309e 100644 --- a/rtorrent/Pkgfile +++ b/rtorrent/Pkgfile @@ -4,7 +4,7 @@ # Depends on: libtorrent libsigc++ name=rtorrent -version=0.9.3 +version=0.9.4 release=1 source=(http://libtorrent.rakshasa.no/downloads/rtorrent-$version.tar.gz) diff --git a/sxiv/Pkgfile b/sxiv/Pkgfile index 9a6ed70d6..eee5c2848 100644 --- a/sxiv/Pkgfile +++ b/sxiv/Pkgfile @@ -1,11 +1,11 @@ # Description: simple/suckless image-viewer -# URL: https://github.com/muennich/sxiv.html +# URL: https://github.com/muennich/sxiv # Maintainer: Maximilian Dietrich, dxm at openmailbox dot org # Depends on: imlib2 name=sxiv version=1.2 -release=1 +release=2 source=(https://github.com/muennich/$name/archive/v$version.tar.gz config.h) build () { diff --git a/syslog-ng/.footprint b/syslog-ng/.footprint index 4f4df3480..d4d6b9023 100644 --- a/syslog-ng/.footprint +++ b/syslog-ng/.footprint @@ -89,9 +89,9 @@ drwxr-xr-x root/root usr/include/syslog-ng/ -rw-r--r-- root/root usr/include/syslog-ng/versioning.h -rw-r--r-- root/root usr/include/syslog-ng/vptransform.h drwxr-xr-x root/root usr/lib/ --rwxr-xr-x root/root usr/lib/libsyslog-ng-3.4.7.so +-rwxr-xr-x root/root usr/lib/libsyslog-ng-3.4.8.so -rwxr-xr-x root/root usr/lib/libsyslog-ng.la -lrwxrwxrwx root/root usr/lib/libsyslog-ng.so -> libsyslog-ng-3.4.7.so +lrwxrwxrwx root/root usr/lib/libsyslog-ng.so -> libsyslog-ng-3.4.8.so drwxr-xr-x root/root usr/lib/pkgconfig/ -rw-r--r-- root/root usr/lib/pkgconfig/syslog-ng.pc drwxr-xr-x root/root usr/lib/syslog-ng/ diff --git a/syslog-ng/.md5sum b/syslog-ng/.md5sum index 8770bae7f..cf7dc7979 100644 --- a/syslog-ng/.md5sum +++ b/syslog-ng/.md5sum @@ -1,3 +1,3 @@ b47754ffdc1c75e8f7775802afffabee syslog-ng.conf 9f48c4550aabdb308883dac66f20d7c1 syslog-ng.rc -eed6df3a8728bbc4c607c3b44aeaa405 syslog-ng_3.4.7.tar.gz +0717c3e96186b5d1e7ce02d6bc206353 syslog-ng_3.4.8.tar.gz diff --git a/syslog-ng/Pkgfile b/syslog-ng/Pkgfile index 0fa8cabd3..461dd4692 100644 --- a/syslog-ng/Pkgfile +++ b/syslog-ng/Pkgfile @@ -4,7 +4,7 @@ # Depends on: eventlog name=syslog-ng -version=3.4.7 +version=3.4.8 release=1 source=(http://balabit.com/downloads/files/syslog-ng/sources/$version/source/${name}_${version}.tar.gz syslog-ng.rc syslog-ng.conf) diff --git a/testdisk/.md5sum b/testdisk/.md5sum index 02fc1d601..c42513cbd 100644 --- a/testdisk/.md5sum +++ b/testdisk/.md5sum @@ -1 +1 @@ -3bcbf0722d3823ca155e633969ce9f0b testdisk-6.13.tar.bz2 +b1f0edabc9035e9ec9c8e0a95059ff3f testdisk-6.14.tar.bz2 diff --git a/testdisk/Pkgfile b/testdisk/Pkgfile index 4d287a0d3..87cc60c5a 100644 --- a/testdisk/Pkgfile +++ b/testdisk/Pkgfile @@ -5,7 +5,7 @@ # Depends on: ntfs-3g libjpeg name=testdisk -version=6.13 +version=6.14 release=1 source=(http://www.cgsecurity.org/$name-$version.tar.bz2) diff --git a/tor/.md5sum b/tor/.md5sum index 28755d259..bfbe6c99f 100644 --- a/tor/.md5sum +++ b/tor/.md5sum @@ -1,3 +1,3 @@ -a8cd8e3b3a3f6a7770f2c22d280f19b8 tor-0.2.4.20.tar.gz +5a7eee0d9df87233255d78b25c6f8270 tor-0.2.4.22.tar.gz 53f221aeaaaede055c810cd1858b294c tor-config.patch 64a6fed3c6c30ea20f3e1362dcbf0a93 tor.rc diff --git a/tor/Pkgfile b/tor/Pkgfile index a2fb16b7e..a2df8cf27 100644 --- a/tor/Pkgfile +++ b/tor/Pkgfile @@ -5,7 +5,7 @@ # Depends on: libevent openssl zlib name=tor -version=0.2.4.20 +version=0.2.4.22 release=1 source=(https://www.torproject.org/dist/tor-$version.tar.gz tor.rc tor-config.patch)