From 3064488d60436acb319dd4787c8c5e8cab8c6610 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Thu, 26 Sep 2013 12:39:54 +0200 Subject: [PATCH 001/159] gstreamer1: update to 1.2.0. --- srcpkgs/gstreamer1/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/gstreamer1/template b/srcpkgs/gstreamer1/template index 1470fbe321c..8575388610a 100644 --- a/srcpkgs/gstreamer1/template +++ b/srcpkgs/gstreamer1/template @@ -1,6 +1,6 @@ # Template file for 'gstreamer1'. pkgname=gstreamer1 -version=1:1.0.10 +version=1:1.2.0 revision=1 wrksrc="gstreamer-${version#*:}" build_style=gnu-configure @@ -13,7 +13,7 @@ maintainer="Juan RP " homepage="http://gstreamer.freedesktop.org/" license="LGPL-2.1" distfiles="http://gstreamer.freedesktop.org/src/gstreamer/gstreamer-${version#*:}.tar.xz" -checksum=8e0aa9f41370586171a2616326fbc508bc4b61ffc4d55b2a8c4c3459d0cc1130 +checksum=94af5274299f845adf41cc504e0209b269acab7721293f49850fea27b4099463 gstreamer1-devel_package() { depends="libxml2-devel libglib-devel ${sourcepkg}-${version}_${revision}" From 8a771bf21dee33253809e3146a37b40b1e56d7ee Mon Sep 17 00:00:00 2001 From: Juan RP Date: Thu, 26 Sep 2013 12:44:08 +0200 Subject: [PATCH 002/159] orc: update to 0.4.18. --- srcpkgs/orc/template | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/srcpkgs/orc/template b/srcpkgs/orc/template index 8be58b342b6..c31a5fb4e9c 100644 --- a/srcpkgs/orc/template +++ b/srcpkgs/orc/template @@ -1,29 +1,25 @@ # Template build file for 'orc'. pkgname=orc -version=0.4.17 +version=0.4.18 revision=1 build_style=gnu-configure configure_args="--disable-static" -hostmakedepends="pkg-config" +hostmakedepends="pkg-config libtool" short_desc="The Oild Runtime Compiler" maintainer="Juan RP " homepage="http://code.entropywave.com/orc/" license="Simplified BSD, New BSD license" distfiles="http://code.entropywave.com/download/orc/orc-${version}.tar.gz" -checksum=4fc7cca48c59fff23afee78fb642cdbde001f56401c8f47b95a16578d1d5d7e8 +checksum=34d3c8a7259f42bed4dcfbc106c5e3d0cc8e17eeaa73128d1c5eaf92883a6a24 long_desc=" Orc is a library and set of tools for compiling and executing very simple programs that operate on arrays of data. The “language” is a generic assembly language that represents many of the features available in SIMD architectures, including saturated addition and subtraction, and many arithmetic operations." -if [ "$CROSS_BUILD" ]; then - hostmakedepends+=" automake libtool" - pre_configure() { - sed -e 's,AM_CONFIG_HEADER,AC_CONFIG_HEADERS,g' -i configure.ac - autoreconf -fi - } -fi +pre_configure() { + libtoolize -f +} post_install() { vinstall COPYING 644 usr/share/licenses/orc @@ -35,12 +31,13 @@ orc-devel_package() { pkg_install() { vmove usr/include vmove usr/lib/pkgconfig + vmove "usr/lib/*.so" vmove usr/share/gtk-doc } } orc_package() { pkg_install() { - vmove usr + vmove all } } From 2e0f98a05a60d8179c4739523d7ba78607feac44 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Thu, 26 Sep 2013 12:46:56 +0200 Subject: [PATCH 003/159] gst-plugins-base1: update to 1.2.0. --- srcpkgs/gst-plugins-base1/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/gst-plugins-base1/template b/srcpkgs/gst-plugins-base1/template index be66f992a09..8499e77a6e0 100644 --- a/srcpkgs/gst-plugins-base1/template +++ b/srcpkgs/gst-plugins-base1/template @@ -1,6 +1,6 @@ # Template file for 'gst-plugins-base1'. pkgname=gst-plugins-base1 -version=1:1.0.10 +version=1:1.2.0 revision=1 wrksrc="gst-plugins-base-${version#*:}" build_style=gnu-configure @@ -10,13 +10,13 @@ makedepends="libgudev-devel gstreamer1-devel>=${version} glib-devel libxml2-devel pango-devel cairo-devel liboil-devel alsa-lib-devel libXv-devel libXext-devel libvisual-devel cdparanoia-devel libtheora-devel libvorbis-devel - libSM-devel orc-devel>=0.4.17" + libSM-devel orc-devel>=0.4.18" short_desc="GStreamer Base Plug-ins (v1.x)" maintainer="Juan RP " homepage="http://gstreamer.freedesktop.org/" license="GPL-2, LGPL-2.1" distfiles="http://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-${version#*:}.tar.xz" -checksum=9754e83b2a3ff61266112915bfc84c895c4d145519ad9a3381edceb216bc97e8 +checksum=8656e20bf4b675e5696fb4af193793351926d428ca02826c5667a6384729a45d gst-plugins-base1-devel_package() { depends="gstreamer1-devel>=${version} ${sourcepkg}-${version}_${revision}" @@ -31,7 +31,7 @@ gst-plugins-base1-devel_package() { } gst-plugins-base1_package() { - depends="orc>=0.4.17 gstreamer1>=${version}" + depends="orc>=0.4.18 gstreamer1>=${version}" pkg_install() { vmove all } From a8fd8a4cef28958f85ef4ff32b68e96371ee0214 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Thu, 26 Sep 2013 12:54:27 +0200 Subject: [PATCH 004/159] gst-plugins-good1: update to 1.2.0. --- srcpkgs/gst-plugins-good1/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/gst-plugins-good1/template b/srcpkgs/gst-plugins-good1/template index 98f85f06cc5..d800e7be8cc 100644 --- a/srcpkgs/gst-plugins-good1/template +++ b/srcpkgs/gst-plugins-good1/template @@ -1,6 +1,6 @@ # Template file for 'gst-plugins-good1'. pkgname=gst-plugins-good1 -version=1:1.0.10 +version=1:1.2.0 revision=1 wrksrc="gst-plugins-good-${version#*:}" build_style=gnu-configure @@ -12,14 +12,14 @@ hostmakedepends="pkg-config intltool" makedepends="libpng-devel>=1.6 libxml2-devel libgudev-devel libflac-devel libXdamage-devel gtk+-devel aalib-devel libcaca-devel libvpx-devel taglib-devel libsoup-gnome-devel gst-plugins-base1-devel>=${version} - GConf-devel pulseaudio-devel orc-devel>=0.4.16 libXv-devel wavpack-devel + GConf-devel pulseaudio-devel orc-devel>=0.4.18 libXv-devel wavpack-devel v4l-utils-devel jack-devel speex-devel" short_desc="GStreamer set of well-maintained good plug-ins (1.x)" maintainer="Juan RP " homepage="http://gstreamer.freedesktop.org/" license="LGPL-2.1" distfiles="http://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-${version#*:}.tar.xz" -checksum=c60342d6080ac6f794c5c2427dfbdee9140a2f67b82e7e945e286a2d416428ae +checksum=2256a6b2744ea18d8810642cf9061a2f12f4b7eba87d3fbc98004262b4f0fdfa gst-plugins-good1_package() { depends="gst-plugins-base1>=${version}" From b552695689e0862b9885ab3b00ece27effa06d91 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Thu, 26 Sep 2013 13:02:12 +0200 Subject: [PATCH 005/159] gst-plugins-bad1: update to 1.2.0. --- srcpkgs/gst-plugins-bad1/template | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/srcpkgs/gst-plugins-bad1/template b/srcpkgs/gst-plugins-bad1/template index a5addd2662f..33e4ebd48cc 100644 --- a/srcpkgs/gst-plugins-bad1/template +++ b/srcpkgs/gst-plugins-bad1/template @@ -1,7 +1,7 @@ # Template file for 'gst-plugins-bad1'. pkgname=gst-plugins-bad1 -version=1:1.0.10 -revision=2 +version=1:1.2.0 +revision=1 wrksrc="gst-plugins-bad-${version#*:}" build_style=gnu-configure configure_args="--enable-experimental --disable-static" @@ -10,16 +10,17 @@ maintainer="Juan RP " license="GPL-2, LGPL-2.1" homepage="http://gstreamer.freedesktop.org" distfiles="$homepage/src/gst-plugins-bad/gst-plugins-bad-${version#*:}.tar.xz" -checksum=91da60ba2ee5c681f11188a4a456894e7f989435c2102c15eff97bbd4fc4c726 +checksum=a12fac6c106a7e4ae8bb2c7da508688d7db532b818319df2202f497cbd930afa hostmakedepends="pkg-config intltool" makedepends="alsa-lib-devel celt-devel openssl-devel exempi-devel - gst-plugins-base1-devel>=${version} libdca-devel orc-devel>=0.4.17 libmms-devel + gst-plugins-base1-devel>=${version} libdca-devel orc-devel>=0.4.18 libmms-devel libexif-devel libmpcdec-devel faac-devel SDL-devel libpng-devel>=1.5.10 faad2-devel libdvdread-devel libdvdnav-devel librsvg-devel libsndfile-devel xvidcore-devel jasper-devel libmodplug-devel neon-devel libcurl-devel libvpx-devel libvdpau-devel libgsm-devel librtmp-devel libass-devel - mpg123-devel soundtouch-devel opus-devel" + mpg123-devel soundtouch-devel opus-devel libwebp-devel wayland-devel + libsrtp-devel" gst-plugins-bad1-devel_package() { depends="gst-plugins-base1-devel>=${version} ${sourcepkg}-${version}_${revision}" From d6bd7fb963ff2ff464367980eb6c7b218020d3d8 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Thu, 26 Sep 2013 13:05:57 +0200 Subject: [PATCH 006/159] gst-plugins-ugly1: update to 1.2.0. --- srcpkgs/gst-plugins-ugly1/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/gst-plugins-ugly1/template b/srcpkgs/gst-plugins-ugly1/template index 04d286f4bc3..7f3ece7b3c1 100644 --- a/srcpkgs/gst-plugins-ugly1/template +++ b/srcpkgs/gst-plugins-ugly1/template @@ -1,6 +1,6 @@ # Template file for 'gst-plugins-ugly1'. pkgname=gst-plugins-ugly1 -version=1:1.0.10 +version=1:1.2.0 revision=1 wrksrc="gst-plugins-ugly-${version#*:}" build_style=gnu-configure @@ -10,16 +10,16 @@ maintainer="Juan RP " license="GPL-2, LGPL-2.1" homepage="http://gstreamer.freedesktop.org" distfiles="http://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-${version#*:}.tar.xz" -checksum=bed3510e09f036e7609e8d291535c395d25109b1180324b16859f475eac3a3c0 +checksum=e4760af4b12bf97ba0a8001cfe733d9d52160a0ad81f6c6f0d0d3a9e798626de # XXX add required pkgs for the amr, sid plugins. hostmakedepends="pkg-config intltool" makedepends="glib-devel libxml2-devel gst-plugins-base1-devel>=${version} libcdio-devel libdvdread-devel libmad-devel x264-devel>=20120126.2245_2 - orc-devel>=0.4.17 liba52-devel libmpeg2-devel lame-devel" + orc-devel>=0.4.18 liba52-devel libmpeg2-devel lame-devel" gst-plugins-ugly1_package() { - depends="orc>=0.4.17 gst-plugins-base1>=${version}" + depends="orc>=0.4.18 gst-plugins-base1>=${version}" pkg_install() { vmove all } From af8114edcf7642fb41f71b37bd5c65e4a82b0a77 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Thu, 26 Sep 2013 13:09:53 +0200 Subject: [PATCH 007/159] gst-libav: update to 1.2.0. --- srcpkgs/gst-libav/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/gst-libav/template b/srcpkgs/gst-libav/template index 8762c65b350..ad8976e1128 100644 --- a/srcpkgs/gst-libav/template +++ b/srcpkgs/gst-libav/template @@ -1,21 +1,21 @@ # Template file for 'gst-libav' pkgname=gst-libav -version=1:1.0.10 +version=1:1.2.0 revision=1 wrksrc="${pkgname}-${version#*:}" build_style=gnu-configure configure_args="--with-libav-extra-configure=--enable-runtime-cpudetect" hostmakedepends="pkg-config yasm python" -makedepends="orc-devel>=0.4.17 gst-plugins-base1-devel>=${version}" +makedepends="orc-devel>=0.4.18 gst-plugins-base1-devel>=${version}" short_desc="GStreamer libav plugin" maintainer="Juan RP " license="GPL-2" homepage="http://gstreamer.freedesktop.org" distfiles="${homepage}/src/${pkgname}/${pkgname}-${version#*:}.tar.xz" -checksum=b6d059d1a39967ef7e1d345009fe003afe14ab55006d68e895a64f4a36968c5e +checksum=48721eb318ffffdd134edea754d0b65d76b08c8209a8d2c8a42bca1f799f9099 gst-libav_package() { - depends="orc>=0.4.17 gst-plugins-base1>=${version}" + depends="orc>=0.4.18 gst-plugins-base1>=${version}" pkg_install() { vmove all } From f5a8bcc572f4d35933d67140d194ea437ba0df7f Mon Sep 17 00:00:00 2001 From: Juan RP Date: Thu, 26 Sep 2013 13:15:03 +0200 Subject: [PATCH 008/159] cogl: update to 1.16.0 (soname bumps). --- common/shlibs | 5 +- .../patches/cogl-1.14.0-21-ge26464f.patch | 1434 ----------------- .../cogl-1.14.0-21-ge26464f.patch.args | 1 - srcpkgs/cogl/template | 20 +- 4 files changed, 12 insertions(+), 1448 deletions(-) delete mode 100644 srcpkgs/cogl/patches/cogl-1.14.0-21-ge26464f.patch delete mode 100644 srcpkgs/cogl/patches/cogl-1.14.0-21-ge26464f.patch.args diff --git a/common/shlibs b/common/shlibs index 0965ab1efe0..98cb5233998 100644 --- a/common/shlibs +++ b/common/shlibs @@ -797,8 +797,9 @@ libmx-1.0.so.2 mx-1.4.3_1_1 libmx-gtk-1.0.so.0 mx-1.4.3_1_1 libjson.so.0 json-c-0.9_1 libjson-c.so.2 json-c-0.11_1 -libcogl.so.12 cogl-1.14.0_1 -libcogl-pango.so.12 cogl-1.14.0_1 +libcogl.so.15 cogl-1.16.0_1 +libcogl-pango.so.15 cogl-1.16.0_1 +libcogl-gst.so.15 cogl-1.16.0_1 libp11-kit.so.0 p11-kit-0.7_1 librest-0.7.so.0 rest-0.7_1 librest-extras-0.7.so.0 rest-0.7_1 diff --git a/srcpkgs/cogl/patches/cogl-1.14.0-21-ge26464f.patch b/srcpkgs/cogl/patches/cogl-1.14.0-21-ge26464f.patch deleted file mode 100644 index 80e96c5dbd9..00000000000 --- a/srcpkgs/cogl/patches/cogl-1.14.0-21-ge26464f.patch +++ /dev/null @@ -1,1434 +0,0 @@ -Only things missing here from upstream are translations and .gitignore changes - -diff --git a/cogl/Makefile.am b/cogl/Makefile.am -index 33214ab..80d3b09 100644 ---- a/cogl/Makefile.am -+++ b/cogl/Makefile.am -@@ -349,6 +349,8 @@ cogl_sources_c = \ - $(srcdir)/cogl-pipeline-snippet.c \ - $(srcdir)/cogl-pipeline-cache.h \ - $(srcdir)/cogl-pipeline-cache.c \ -+ $(srcdir)/cogl-pipeline-hash-table.h \ -+ $(srcdir)/cogl-pipeline-hash-table.c \ - $(srcdir)/cogl-material-compat.c \ - $(srcdir)/cogl-program.c \ - $(srcdir)/cogl-program-private.h \ -@@ -552,7 +554,7 @@ include $(top_srcdir)/build/autotools/Makefile.am.enums - - lib_LTLIBRARIES += libcogl.la - --libcogl_la_LIBADD = -lm $(COGL_DEP_LIBS) $(COGL_EXTRA_LDFLAGS) -+libcogl_la_LIBADD = $(LIBM) $(COGL_DEP_LIBS) $(COGL_EXTRA_LDFLAGS) - if !USE_GLIB - libcogl_la_LIBADD += $(top_builddir)/deps/glib/libglib.la - libcogl_la_LIBADD += $(top_builddir)/deps/gmodule/libgmodule.la -diff --git a/cogl/cogl-bitmap-pixbuf.c b/cogl/cogl-bitmap-pixbuf.c -index a02b253..ad34234 100644 ---- a/cogl/cogl-bitmap-pixbuf.c -+++ b/cogl/cogl-bitmap-pixbuf.c -@@ -125,11 +125,24 @@ _cogl_bitmap_from_file (CoglContext *ctx, - /* allocate buffer big enough to hold pixel data */ - bmp = _cogl_bitmap_new_with_malloc_buffer (ctx, - width, height, -- COGL_PIXEL_FORMAT_ARGB_8888); -+ COGL_PIXEL_FORMAT_ARGB_8888, -+ error); -+ if (bmp == NULL) -+ { -+ CFRelease (image); -+ return NULL; -+ } - rowstride = cogl_bitmap_get_rowstride (bmp); - out_data = _cogl_bitmap_map (bmp, - COGL_BUFFER_ACCESS_WRITE, -- COGL_BUFFER_MAP_HINT_DISCARD); -+ COGL_BUFFER_MAP_HINT_DISCARD, -+ error); -+ if (out_data == NULL) -+ { -+ cogl_object_unref (bmp); -+ CFRelease (image); -+ return NULL; -+ } - - /* render to buffer */ - color_space = CGColorSpaceCreateWithName (kCGColorSpaceGenericRGB); -diff --git a/cogl/cogl-matrix.h b/cogl/cogl-matrix.h -index 90f3ea9..a136ea0 100644 ---- a/cogl/cogl-matrix.h -+++ b/cogl/cogl-matrix.h -@@ -27,6 +27,8 @@ - #ifndef __COGL_MATRIX_H - #define __COGL_MATRIX_H - -+#include -+ - #ifdef COGL_HAS_GTYPE_SUPPORT - #include - #endif /* COGL_HAS_GTYPE_SUPPORT */ -diff --git a/cogl/cogl-pipeline-cache.c b/cogl/cogl-pipeline-cache.c -index fab3614..df4c433 100644 ---- a/cogl/cogl-pipeline-cache.c -+++ b/cogl/cogl-pipeline-cache.c -@@ -3,7 +3,7 @@ - * - * An object oriented GL/GLES Abstraction/Utility Layer - * -- * Copyright (C) 2011 Intel Corporation. -+ * Copyright (C) 2011, 2013 Intel Corporation. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public -@@ -32,133 +32,47 @@ - #include "cogl-context-private.h" - #include "cogl-pipeline-private.h" - #include "cogl-pipeline-cache.h" -+#include "cogl-pipeline-hash-table.h" - - struct _CoglPipelineCache - { -- GHashTable *fragment_hash; -- GHashTable *vertex_hash; -- GHashTable *combined_hash; -+ CoglPipelineHashTable fragment_hash; -+ CoglPipelineHashTable vertex_hash; -+ CoglPipelineHashTable combined_hash; - }; - --static unsigned int --pipeline_fragment_hash (const void *data) --{ -- unsigned int fragment_state; -- unsigned int layer_fragment_state; -- -- _COGL_GET_CONTEXT (ctx, 0); -- -- fragment_state = -- _cogl_pipeline_get_state_for_fragment_codegen (ctx); -- layer_fragment_state = -- _cogl_pipeline_get_layer_state_for_fragment_codegen (ctx); -- -- return _cogl_pipeline_hash ((CoglPipeline *)data, -- fragment_state, layer_fragment_state, -- 0); --} -- --static CoglBool --pipeline_fragment_equal (const void *a, const void *b) -+CoglPipelineCache * -+_cogl_pipeline_cache_new (void) - { -+ CoglPipelineCache *cache = g_new (CoglPipelineCache, 1); -+ unsigned long vertex_state; -+ unsigned long layer_vertex_state; - unsigned int fragment_state; - unsigned int layer_fragment_state; - - _COGL_GET_CONTEXT (ctx, 0); - -+ vertex_state = -+ COGL_PIPELINE_STATE_AFFECTS_VERTEX_CODEGEN; -+ layer_vertex_state = -+ COGL_PIPELINE_LAYER_STATE_AFFECTS_VERTEX_CODEGEN; - fragment_state = - _cogl_pipeline_get_state_for_fragment_codegen (ctx); - layer_fragment_state = - _cogl_pipeline_get_layer_state_for_fragment_codegen (ctx); - -- return _cogl_pipeline_equal ((CoglPipeline *)a, (CoglPipeline *)b, -- fragment_state, layer_fragment_state, -- 0); --} -- --static unsigned int --pipeline_vertex_hash (const void *data) --{ -- unsigned long vertex_state = -- COGL_PIPELINE_STATE_AFFECTS_VERTEX_CODEGEN; -- unsigned long layer_vertex_state = -- COGL_PIPELINE_LAYER_STATE_AFFECTS_VERTEX_CODEGEN; -- -- return _cogl_pipeline_hash ((CoglPipeline *)data, -- vertex_state, layer_vertex_state, -- 0); --} -- --static CoglBool --pipeline_vertex_equal (const void *a, const void *b) --{ -- unsigned long vertex_state = -- COGL_PIPELINE_STATE_AFFECTS_VERTEX_CODEGEN; -- unsigned long layer_vertex_state = -- COGL_PIPELINE_LAYER_STATE_AFFECTS_VERTEX_CODEGEN; -- -- return _cogl_pipeline_equal ((CoglPipeline *)a, (CoglPipeline *)b, -- vertex_state, layer_vertex_state, -- 0); --} -- --static unsigned int --pipeline_combined_hash (const void *data) --{ -- unsigned int combined_state; -- unsigned int layer_combined_state; -- -- _COGL_GET_CONTEXT (ctx, 0); -- -- combined_state = -- _cogl_pipeline_get_state_for_fragment_codegen (ctx) | -- COGL_PIPELINE_STATE_AFFECTS_VERTEX_CODEGEN; -- layer_combined_state = -- _cogl_pipeline_get_layer_state_for_fragment_codegen (ctx) | -- COGL_PIPELINE_LAYER_STATE_AFFECTS_VERTEX_CODEGEN; -- -- return _cogl_pipeline_hash ((CoglPipeline *)data, -- combined_state, layer_combined_state, -- 0); --} -- --static CoglBool --pipeline_combined_equal (const void *a, const void *b) --{ -- unsigned int combined_state; -- unsigned int layer_combined_state; -- -- _COGL_GET_CONTEXT (ctx, 0); -- -- combined_state = -- _cogl_pipeline_get_state_for_fragment_codegen (ctx) | -- COGL_PIPELINE_STATE_AFFECTS_VERTEX_CODEGEN; -- layer_combined_state = -- _cogl_pipeline_get_layer_state_for_fragment_codegen (ctx) | -- COGL_PIPELINE_LAYER_STATE_AFFECTS_VERTEX_CODEGEN; -- -- return _cogl_pipeline_equal ((CoglPipeline *)a, (CoglPipeline *)b, -- combined_state, layer_combined_state, -- 0); --} -- --CoglPipelineCache * --_cogl_pipeline_cache_new (void) --{ -- CoglPipelineCache *cache = g_new (CoglPipelineCache, 1); -- -- cache->fragment_hash = g_hash_table_new_full (pipeline_fragment_hash, -- pipeline_fragment_equal, -- cogl_object_unref, -- cogl_object_unref); -- cache->vertex_hash = g_hash_table_new_full (pipeline_vertex_hash, -- pipeline_vertex_equal, -- cogl_object_unref, -- cogl_object_unref); -- cache->combined_hash = g_hash_table_new_full (pipeline_combined_hash, -- pipeline_combined_equal, -- cogl_object_unref, -- cogl_object_unref); -+ _cogl_pipeline_hash_table_init (&cache->vertex_hash, -+ vertex_state, -+ layer_vertex_state, -+ "vertex shaders"); -+ _cogl_pipeline_hash_table_init (&cache->fragment_hash, -+ fragment_state, -+ layer_fragment_state, -+ "fragment shaders"); -+ _cogl_pipeline_hash_table_init (&cache->combined_hash, -+ vertex_state | fragment_state, -+ layer_vertex_state | layer_fragment_state, -+ "programs"); - - return cache; - } -@@ -166,9 +80,9 @@ _cogl_pipeline_cache_new (void) - void - _cogl_pipeline_cache_free (CoglPipelineCache *cache) - { -- g_hash_table_destroy (cache->fragment_hash); -- g_hash_table_destroy (cache->vertex_hash); -- g_hash_table_destroy (cache->combined_hash); -+ _cogl_pipeline_hash_table_destroy (&cache->fragment_hash); -+ _cogl_pipeline_hash_table_destroy (&cache->vertex_hash); -+ _cogl_pipeline_hash_table_destroy (&cache->combined_hash); - g_free (cache); - } - -@@ -176,107 +90,22 @@ CoglPipeline * - _cogl_pipeline_cache_get_fragment_template (CoglPipelineCache *cache, - CoglPipeline *key_pipeline) - { -- CoglPipeline *template = -- g_hash_table_lookup (cache->fragment_hash, key_pipeline); -- -- if (template == NULL) -- { -- /* XXX: I wish there was a way to insert into a GHashTable with -- * a pre-calculated hash value since there is a cost to -- * calculating the hash of a CoglPipeline and in this case we -- * know we have already called _cogl_pipeline_hash during the -- * lookup so we could pass the value through to here to avoid -- * hashing it again. -- */ -- -- /* XXX: Any keys referenced by the hash table need to remain -- * valid all the while that there are corresponding values, -- * so for now we simply make a copy of the current authority -- * pipeline. -- * -- * FIXME: A problem with this is that our key into the cache may -- * hold references to some arbitrary user textures which will -- * now be kept alive indefinitly which is a shame. A better -- * solution will be to derive a special "key pipeline" from the -- * authority which derives from the base Cogl pipeline (to avoid -- * affecting the lifetime of any other pipelines) and only takes -- * a copy of the state that relates to the fragment shader and -- * references small dummy textures instead of potentially large -- * user textures. */ -- template = cogl_pipeline_copy (key_pipeline); -- -- g_hash_table_insert (cache->fragment_hash, -- template, -- cogl_object_ref (template)); -- -- if (G_UNLIKELY (g_hash_table_size (cache->fragment_hash) > 50)) -- { -- static CoglBool seen = FALSE; -- if (!seen) -- g_warning ("Over 50 separate fragment shaders have been " -- "generated which is very unusual, so something " -- "is probably wrong!\n"); -- seen = TRUE; -- } -- } -- -- return template; -+ return _cogl_pipeline_hash_table_get (&cache->fragment_hash, -+ key_pipeline); - } - - CoglPipeline * - _cogl_pipeline_cache_get_vertex_template (CoglPipelineCache *cache, - CoglPipeline *key_pipeline) - { -- CoglPipeline *template = -- g_hash_table_lookup (cache->vertex_hash, key_pipeline); -- -- if (template == NULL) -- { -- template = cogl_pipeline_copy (key_pipeline); -- -- g_hash_table_insert (cache->vertex_hash, -- template, -- cogl_object_ref (template)); -- -- if (G_UNLIKELY (g_hash_table_size (cache->vertex_hash) > 50)) -- { -- static CoglBool seen = FALSE; -- if (!seen) -- g_warning ("Over 50 separate vertex shaders have been " -- "generated which is very unusual, so something " -- "is probably wrong!\n"); -- seen = TRUE; -- } -- } -- -- return template; -+ return _cogl_pipeline_hash_table_get (&cache->vertex_hash, -+ key_pipeline); - } - - CoglPipeline * - _cogl_pipeline_cache_get_combined_template (CoglPipelineCache *cache, - CoglPipeline *key_pipeline) - { -- CoglPipeline *template = -- g_hash_table_lookup (cache->combined_hash, key_pipeline); -- -- if (template == NULL) -- { -- template = cogl_pipeline_copy (key_pipeline); -- -- g_hash_table_insert (cache->combined_hash, -- template, -- cogl_object_ref (template)); -- -- if (G_UNLIKELY (g_hash_table_size (cache->combined_hash) > 50)) -- { -- static CoglBool seen = FALSE; -- if (!seen) -- g_warning ("Over 50 separate programs have been " -- "generated which is very unusual, so something " -- "is probably wrong!\n"); -- seen = TRUE; -- } -- } -- -- return template; -+ return _cogl_pipeline_hash_table_get (&cache->combined_hash, -+ key_pipeline); - } -diff --git a/cogl/cogl-pipeline-hash-table.c b/cogl/cogl-pipeline-hash-table.c -new file mode 100644 -index 0000000..8921efc ---- /dev/null -+++ b/cogl/cogl-pipeline-hash-table.c -@@ -0,0 +1,153 @@ -+/* -+ * Cogl -+ * -+ * An object oriented GL/GLES Abstraction/Utility Layer -+ * -+ * Copyright (C) 2013 Intel Corporation. -+ * -+ * This library is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU Lesser General Public -+ * License as published by the Free Software Foundation; either -+ * version 2 of the License, or (at your option) any later version. -+ * -+ * This library is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ * Lesser General Public License for more details. -+ * -+ * You should have received a copy of the GNU Lesser General Public -+ * License along with this library. If not, see -+ * . -+ * -+ * -+ * Authors: -+ * Neil Roberts -+ * Robert Bragg -+ */ -+ -+#ifdef HAVE_CONFIG_H -+#include "config.h" -+#endif -+ -+#include "cogl-context-private.h" -+#include "cogl-pipeline-private.h" -+#include "cogl-pipeline-hash-table.h" -+ -+typedef struct -+{ -+ /* The template pipeline */ -+ CoglPipeline *pipeline; -+ -+ /* Calculating the hash is a little bit expensive for pipelines so -+ * we don't want to do it repeatedly for entries that are already in -+ * the hash table. Instead we cache the value here and calculate it -+ * outside of the GHashTable. */ -+ unsigned int hash_value; -+ -+ /* GHashTable annoyingly doesn't let us pass a user data pointer to -+ * the hash and equal functions so to work around it we have to -+ * store the pointer in every hash table entry. We will use this -+ * entry as both the key and the value */ -+ CoglPipelineHashTable *hash; -+} CoglPipelineHashTableEntry; -+ -+static void -+value_destroy_cb (void *value) -+{ -+ CoglPipelineHashTableEntry *entry = value; -+ -+ cogl_object_unref (entry->pipeline); -+ -+ g_slice_free (CoglPipelineHashTableEntry, entry); -+} -+ -+static unsigned int -+entry_hash (const void *data) -+{ -+ const CoglPipelineHashTableEntry *entry = data; -+ -+ return entry->hash_value; -+} -+ -+static CoglBool -+entry_equal (const void *a, -+ const void *b) -+{ -+ const CoglPipelineHashTableEntry *entry_a = a; -+ const CoglPipelineHashTableEntry *entry_b = b; -+ const CoglPipelineHashTable *hash = entry_a->hash; -+ -+ return _cogl_pipeline_equal (entry_a->pipeline, -+ entry_b->pipeline, -+ hash->main_state, -+ hash->layer_state, -+ 0); -+} -+ -+void -+_cogl_pipeline_hash_table_init (CoglPipelineHashTable *hash, -+ unsigned int main_state, -+ unsigned int layer_state, -+ const char *debug_string) -+{ -+ hash->n_unique_pipelines = 0; -+ hash->debug_string = debug_string; -+ hash->main_state = main_state; -+ hash->layer_state = layer_state; -+ hash->table = g_hash_table_new_full (entry_hash, -+ entry_equal, -+ NULL, /* key destroy */ -+ value_destroy_cb); -+} -+ -+void -+_cogl_pipeline_hash_table_destroy (CoglPipelineHashTable *hash) -+{ -+ g_hash_table_destroy (hash->table); -+} -+ -+CoglPipeline * -+_cogl_pipeline_hash_table_get (CoglPipelineHashTable *hash, -+ CoglPipeline *key_pipeline) -+{ -+ CoglPipelineHashTableEntry dummy_entry; -+ CoglPipelineHashTableEntry *entry; -+ unsigned int copy_state; -+ -+ dummy_entry.pipeline = key_pipeline; -+ dummy_entry.hash = hash; -+ dummy_entry.hash_value = _cogl_pipeline_hash (key_pipeline, -+ hash->main_state, -+ hash->layer_state, -+ 0); -+ entry = g_hash_table_lookup (hash->table, &dummy_entry); -+ -+ if (entry) -+ return entry->pipeline; -+ -+ if (hash->n_unique_pipelines == 50) -+ g_warning ("Over 50 separate %s have been generated which is very " -+ "unusual, so something is probably wrong!\n", -+ hash->debug_string); -+ -+ entry = g_slice_new (CoglPipelineHashTableEntry); -+ entry->hash = hash; -+ entry->hash_value = dummy_entry.hash_value; -+ -+ copy_state = hash->main_state; -+ if (hash->layer_state) -+ copy_state |= COGL_PIPELINE_STATE_LAYERS; -+ -+ /* Create a new pipeline that is a child of the root pipeline -+ * instead of a normal copy so that the template pipeline won't hold -+ * a reference to the original pipeline */ -+ entry->pipeline = _cogl_pipeline_deep_copy (key_pipeline, -+ copy_state, -+ hash->layer_state); -+ -+ g_hash_table_insert (hash->table, entry, entry); -+ -+ hash->n_unique_pipelines++; -+ -+ return entry->pipeline; -+} -diff --git a/cogl/cogl-pipeline-hash-table.h b/cogl/cogl-pipeline-hash-table.h -new file mode 100644 -index 0000000..1b0a0d9 ---- /dev/null -+++ b/cogl/cogl-pipeline-hash-table.h -@@ -0,0 +1,69 @@ -+/* -+ * Cogl -+ * -+ * An object oriented GL/GLES Abstraction/Utility Layer -+ * -+ * Copyright (C) 2013 Intel Corporation. -+ * -+ * This library is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU Lesser General Public -+ * License as published by the Free Software Foundation; either -+ * version 2 of the License, or (at your option) any later version. -+ * -+ * This library is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ * Lesser General Public License for more details. -+ * -+ * You should have received a copy of the GNU Lesser General Public -+ * License along with this library. If not, see . -+ * -+ * -+ */ -+ -+#ifndef __COGL_PIPELINE_HASH_H__ -+#define __COGL_PIPELINE_HASH_H__ -+ -+#include "cogl-pipeline.h" -+ -+typedef struct -+{ -+ /* Total number of pipelines that were ever added to the hash. This -+ * is not decremented when a pipeline is removed. It is only used to -+ * generate a warning if an unusually high number of pipelines are -+ * generated */ -+ int n_unique_pipelines; -+ -+ /* String that will be used to describe the usage of this hash table -+ * in the debug warning when too many pipelines are generated. This -+ * must be a static string because it won't be copied or freed */ -+ const char *debug_string; -+ -+ unsigned int main_state; -+ unsigned int layer_state; -+ -+ GHashTable *table; -+} CoglPipelineHashTable; -+ -+void -+_cogl_pipeline_hash_table_init (CoglPipelineHashTable *hash, -+ unsigned int main_state, -+ unsigned int layer_state, -+ const char *debug_string); -+ -+void -+_cogl_pipeline_hash_table_destroy (CoglPipelineHashTable *hash); -+ -+/* -+ * Gets a pipeline from the hash that has the same state as -+ * @key_pipeline according to the limited state bits passed to -+ * _cogl_pipeline_hash_table_init(). If there is no matching pipelines -+ * already then a copy of key_pipeline is stored in the hash so that -+ * it will be used next time the function is called with a similar -+ * pipeline. In that case the copy itself will be returned -+ */ -+CoglPipeline * -+_cogl_pipeline_hash_table_get (CoglPipelineHashTable *hash, -+ CoglPipeline *key_pipeline); -+ -+#endif /* __COGL_PIPELINE_HASH_H__ */ -diff --git a/cogl/cogl-pipeline-layer-private.h b/cogl/cogl-pipeline-layer-private.h -index 125b967..7577559 100644 ---- a/cogl/cogl-pipeline-layer-private.h -+++ b/cogl/cogl-pipeline-layer-private.h -@@ -358,6 +358,11 @@ _cogl_pipeline_layer_get_wrap_mode_t (CoglPipelineLayer *layer); - CoglPipelineWrapMode - _cogl_pipeline_layer_get_wrap_mode_p (CoglPipelineLayer *layer); - -+void -+_cogl_pipeline_layer_copy_differences (CoglPipelineLayer *dest, -+ CoglPipelineLayer *src, -+ unsigned long differences); -+ - unsigned long - _cogl_pipeline_layer_compare_differences (CoglPipelineLayer *layer0, - CoglPipelineLayer *layer1); -diff --git a/cogl/cogl-pipeline-layer.c b/cogl/cogl-pipeline-layer.c -index d9590c8..9bc26ef 100644 ---- a/cogl/cogl-pipeline-layer.c -+++ b/cogl/cogl-pipeline-layer.c -@@ -42,6 +42,8 @@ - #include "cogl-context-private.h" - #include "cogl-texture-private.h" - -+#include -+ - static void - _cogl_pipeline_layer_free (CoglPipelineLayer *layer); - -@@ -146,6 +148,107 @@ _cogl_get_n_args_for_combine_func (CoglPipelineCombineFunc func) - return 0; - } - -+void -+_cogl_pipeline_layer_copy_differences (CoglPipelineLayer *dest, -+ CoglPipelineLayer *src, -+ unsigned long differences) -+{ -+ CoglPipelineLayerBigState *big_dest, *big_src; -+ -+ if ((differences & COGL_PIPELINE_LAYER_STATE_NEEDS_BIG_STATE) && -+ !dest->has_big_state) -+ { -+ dest->big_state = g_slice_new (CoglPipelineLayerBigState); -+ dest->has_big_state = TRUE; -+ } -+ -+ big_dest = dest->big_state; -+ big_src = src->big_state; -+ -+ dest->differences |= differences; -+ -+ while (differences) -+ { -+ int index = _cogl_util_ffs (differences) - 1; -+ -+ differences &= ~(1 << index); -+ -+ /* This convoluted switch statement is just here so that we'll -+ * get a warning if a new state is added without handling it -+ * here */ -+ switch (index) -+ { -+ case COGL_PIPELINE_LAYER_STATE_COUNT: -+ case COGL_PIPELINE_LAYER_STATE_UNIT_INDEX: -+ g_warn_if_reached (); -+ break; -+ -+ case COGL_PIPELINE_LAYER_STATE_TEXTURE_TYPE_INDEX: -+ dest->texture_type = src->texture_type; -+ break; -+ -+ case COGL_PIPELINE_LAYER_STATE_TEXTURE_DATA_INDEX: -+ dest->texture = src->texture; -+ if (dest->texture) -+ cogl_object_ref (dest->texture); -+ break; -+ -+ case COGL_PIPELINE_LAYER_STATE_SAMPLER_INDEX: -+ dest->sampler_cache_entry = src->sampler_cache_entry; -+ break; -+ -+ case COGL_PIPELINE_LAYER_STATE_COMBINE_INDEX: -+ { -+ CoglPipelineCombineFunc func; -+ int n_args, i; -+ -+ func = big_src->texture_combine_rgb_func; -+ big_dest->texture_combine_rgb_func = func; -+ n_args = _cogl_get_n_args_for_combine_func (func); -+ for (i = 0; i < n_args; i++) -+ { -+ big_dest->texture_combine_rgb_src[i] = -+ big_src->texture_combine_rgb_src[i]; -+ big_dest->texture_combine_rgb_op[i] = -+ big_src->texture_combine_rgb_op[i]; -+ } -+ -+ func = big_src->texture_combine_alpha_func; -+ big_dest->texture_combine_alpha_func = func; -+ n_args = _cogl_get_n_args_for_combine_func (func); -+ for (i = 0; i < n_args; i++) -+ { -+ big_dest->texture_combine_alpha_src[i] = -+ big_src->texture_combine_alpha_src[i]; -+ big_dest->texture_combine_alpha_op[i] = -+ big_src->texture_combine_alpha_op[i]; -+ } -+ } -+ break; -+ -+ case COGL_PIPELINE_LAYER_STATE_COMBINE_CONSTANT_INDEX: -+ memcpy (big_dest->texture_combine_constant, -+ big_src->texture_combine_constant, -+ sizeof (big_dest->texture_combine_constant)); -+ break; -+ -+ case COGL_PIPELINE_LAYER_STATE_POINT_SPRITE_COORDS_INDEX: -+ big_dest->point_sprite_coords = big_src->point_sprite_coords; -+ break; -+ -+ case COGL_PIPELINE_LAYER_STATE_VERTEX_SNIPPETS_INDEX: -+ _cogl_pipeline_snippet_list_copy (&big_dest->vertex_snippets, -+ &big_src->vertex_snippets); -+ break; -+ -+ case COGL_PIPELINE_LAYER_STATE_FRAGMENT_SNIPPETS_INDEX: -+ _cogl_pipeline_snippet_list_copy (&big_dest->fragment_snippets, -+ &big_src->fragment_snippets); -+ break; -+ } -+ } -+} -+ - static void - _cogl_pipeline_layer_init_multi_property_sparse_state ( - CoglPipelineLayer *layer, -diff --git a/cogl/cogl-pipeline-private.h b/cogl/cogl-pipeline-private.h -index 56700b5..acb5653 100644 ---- a/cogl/cogl-pipeline-private.h -+++ b/cogl/cogl-pipeline-private.h -@@ -845,6 +845,17 @@ _cogl_pipeline_hash (CoglPipeline *pipeline, - unsigned long layer_differences, - CoglPipelineEvalFlags flags); - -+/* Makes a copy of the given pipeline that is a child of the root -+ * pipeline rather than a child of the source pipeline. That way the -+ * new pipeline won't hold a reference to the source pipeline. The -+ * differences specified in @differences and @layer_differences are -+ * copied across and all other state is left with the default -+ * values. */ -+CoglPipeline * -+_cogl_pipeline_deep_copy (CoglPipeline *pipeline, -+ unsigned long differences, -+ unsigned long layer_differences); -+ - CoglPipeline * - _cogl_pipeline_journal_ref (CoglPipeline *pipeline); - -diff --git a/cogl/cogl-pipeline.c b/cogl/cogl-pipeline.c -index c029f45..a91ad25 100644 ---- a/cogl/cogl-pipeline.c -+++ b/cogl/cogl-pipeline.c -@@ -2771,6 +2771,97 @@ _cogl_pipeline_hash (CoglPipeline *pipeline, - - typedef struct - { -+ CoglContext *context; -+ CoglPipeline *src_pipeline; -+ CoglPipeline *dst_pipeline; -+ unsigned int layer_differences; -+} DeepCopyData; -+ -+static CoglBool -+deep_copy_layer_cb (CoglPipelineLayer *src_layer, -+ void *user_data) -+{ -+ DeepCopyData *data = user_data; -+ CoglPipelineLayer *dst_layer; -+ unsigned int differences = data->layer_differences; -+ -+ dst_layer = _cogl_pipeline_get_layer (data->dst_pipeline, src_layer->index); -+ -+ while (src_layer != data->context->default_layer_n && -+ src_layer != data->context->default_layer_0 && -+ differences) -+ { -+ unsigned long to_copy = differences & src_layer->differences; -+ -+ if (to_copy) -+ { -+ _cogl_pipeline_layer_copy_differences (dst_layer, src_layer, to_copy); -+ differences ^= to_copy; -+ } -+ -+ src_layer = COGL_PIPELINE_LAYER (COGL_NODE (src_layer)->parent); -+ } -+ -+ return TRUE; -+} -+ -+CoglPipeline * -+_cogl_pipeline_deep_copy (CoglPipeline *pipeline, -+ unsigned long differences, -+ unsigned long layer_differences) -+{ -+ CoglPipeline *new, *authority; -+ CoglBool copy_layer_state; -+ -+ _COGL_GET_CONTEXT (ctx, NULL); -+ -+ if ((differences & COGL_PIPELINE_STATE_LAYERS)) -+ { -+ copy_layer_state = TRUE; -+ differences &= ~COGL_PIPELINE_STATE_LAYERS; -+ } -+ else -+ copy_layer_state = FALSE; -+ -+ new = cogl_pipeline_new (ctx); -+ -+ for (authority = pipeline; -+ authority != ctx->default_pipeline && differences; -+ authority = COGL_PIPELINE (COGL_NODE (authority)->parent)) -+ { -+ unsigned long to_copy = differences & authority->differences; -+ -+ if (to_copy) -+ { -+ _cogl_pipeline_copy_differences (new, authority, to_copy); -+ differences ^= to_copy; -+ } -+ } -+ -+ if (copy_layer_state) -+ { -+ DeepCopyData data; -+ -+ /* The unit index doesn't need to be copied because it should -+ * end up with the same values anyway because the new pipeline -+ * will have the same indices as the source pipeline */ -+ layer_differences &= ~COGL_PIPELINE_LAYER_STATE_UNIT; -+ -+ data.context = ctx; -+ data.src_pipeline = pipeline; -+ data.dst_pipeline = new; -+ data.layer_differences = layer_differences; -+ -+ _cogl_pipeline_foreach_layer_internal (pipeline, -+ deep_copy_layer_cb, -+ &data); -+ } -+ -+ return new; -+} -+ -+typedef struct -+{ - int i; - CoglPipelineLayer **layers; - } AddLayersToArrayState; -diff --git a/cogl/cogl-xlib-renderer.c b/cogl/cogl-xlib-renderer.c -index 18c0fe6..eb1f51a 100644 ---- a/cogl/cogl-xlib-renderer.c -+++ b/cogl/cogl-xlib-renderer.c -@@ -238,7 +238,7 @@ update_outputs (CoglRenderer *renderer, - - _cogl_xlib_renderer_trap_errors (renderer, &state); - -- for (i = 0; i < resources->ncrtc && !error; i++) -+ for (i = 0; resources && i < resources->ncrtc && !error; i++) - { - XRRCrtcInfo *crtc_info = NULL; - XRROutputInfo *output_info = NULL; -diff --git a/cogl/cogl-xlib.h b/cogl/cogl-xlib.h -index 7a6bc7e..5dab8ae 100644 ---- a/cogl/cogl-xlib.h -+++ b/cogl/cogl-xlib.h -@@ -79,6 +79,8 @@ cogl_xlib_set_display (Display *display); - CoglFilterReturn - cogl_xlib_handle_event (XEvent *xevent); - -+COGL_END_DECLS -+ - #undef __COGL_XLIB_H_INSIDE__ - - #endif /* __COGL_XLIB_H__ */ -diff --git a/configure.ac b/configure.ac -index 43bf407..4ba85b8 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -25,7 +25,7 @@ m4_define([cogl_version], - dnl Since the core Cogl library has to also maintain support for the - dnl Cogl 1.x API for Clutter then we track the 1.x version separately. - m4_define([cogl_1_minor_version], [14]) --m4_define([cogl_1_micro_version], [0]) -+m4_define([cogl_1_micro_version], [1]) - m4_define([cogl_1_version], [1.cogl_1_minor_version.cogl_1_micro_version]) - - dnl ================================================================ -@@ -70,7 +70,7 @@ dnl ================================================================ - # libtool version info we don't automatically derive this from the - # pretty version number because we want to test the results of - # updating the version number in advance of a release. --m4_define([cogl_release_status], [release]) -+m4_define([cogl_release_status], [git]) - - AC_INIT(cogl, [cogl_1_version]) - AC_CONFIG_SRCDIR(cogl/cogl.h) -@@ -178,6 +178,12 @@ dnl internal glib configure (as-glibconfig.m4) - m4_ifdef([LT_OUTPUT], [LT_OUTPUT]) - - dnl ================================================================ -+dnl Find an appropriate libm, for sin() etc. -+dnl ================================================================ -+LT_LIB_M -+AC_SUBST(LIBM) -+ -+dnl ================================================================ - dnl See what platform we are building for - dnl ================================================================ - AC_CANONICAL_HOST -@@ -474,6 +480,7 @@ AS_IF( - EXPERIMENTAL_OPTIONS="$EXPERIMENTAL_OPTIONS Quartz Core Graphics," - AC_DEFINE([USE_QUARTZ], 1, - [Use Core Graphics (Quartz) for loading image data]) -+ COGL_EXTRA_LDFLAGS="$COGL_EXTRA_LDFLAGS -framework ApplicationServices" - COGL_IMAGE_BACKEND="quartz" - ], - [ -@@ -1173,6 +1180,12 @@ AC_CHECK_FUNCS([ffs]) - dnl 'memmem' is a GNU extension but we have a simple fallback - AC_CHECK_FUNCS([memmem]) - -+dnl This is used in the cogl-gles2-gears example but it is a GNU extension -+save_libs="$LIBS" -+LIBS="$LIBS $LIBM" -+AC_CHECK_FUNCS([sincos]) -+LIBS="$save_libs" -+ - dnl ================================================================ - dnl Platform values - dnl ================================================================ -diff --git a/examples/Makefile.am b/examples/Makefile.am -index 86801c6..ae3e5f7 100644 ---- a/examples/Makefile.am -+++ b/examples/Makefile.am -@@ -20,7 +20,8 @@ endif - - common_ldadd = \ - $(COGL_DEP_LIBS) \ -- $(top_builddir)/cogl/libcogl.la -+ $(top_builddir)/cogl/libcogl.la \ -+ $(LIBM) - - if !USE_GLIB - common_ldadd += $(top_builddir)/deps/glib/libglib.la -diff --git a/examples/android/hello/jni/main.c b/examples/android/hello/jni/main.c -index 2c5bd9b..c9a8401 100644 ---- a/examples/android/hello/jni/main.c -+++ b/examples/android/hello/jni/main.c -@@ -42,7 +42,7 @@ static int test_init (TestData* data) - CoglOnscreen *onscreen; - CoglError *error = NULL; - CoglVertexP2C4 triangle_vertices[] = { -- {0, 0.7, 0xff, 0x00, 0x00, 0x80}, -+ {0, 0.7, 0xff, 0x00, 0x00, 0xff}, - {-0.7, -0.7, 0x00, 0xff, 0x00, 0xff}, - {0.7, -0.7, 0x00, 0x00, 0xff, 0xff} - }; -diff --git a/examples/cogl-gles2-context.c b/examples/cogl-gles2-context.c -index 1cf375f..de66c21 100644 ---- a/examples/cogl-gles2-context.c -+++ b/examples/cogl-gles2-context.c -@@ -70,7 +70,7 @@ main (int argc, char **argv) - CoglOnscreen *onscreen; - CoglError *error = NULL; - CoglVertexP2C4 triangle_vertices[] = { -- {0, 0.7, 0xff, 0x00, 0x00, 0x80}, -+ {0, 0.7, 0xff, 0x00, 0x00, 0xff}, - {-0.7, -0.7, 0x00, 0xff, 0x00, 0xff}, - {0.7, -0.7, 0x00, 0x00, 0xff, 0xff} - }; -diff --git a/examples/cogl-gles2-gears.c b/examples/cogl-gles2-gears.c -index d7dd271..c7185b6 100644 ---- a/examples/cogl-gles2-gears.c -+++ b/examples/cogl-gles2-gears.c -@@ -35,6 +35,10 @@ - * Jul 13, 2010 - */ - -+#ifdef HAVE_CONFIG_H -+#include "config.h" -+#endif -+ - #define GL_GLEXT_PROTOTYPES - - #include -@@ -110,6 +114,15 @@ static GLfloat ProjectionMatrix[16]; - /** The direction of the directional light for the scene */ - static const GLfloat LightSourcePosition[4] = { 5.0, 5.0, 10.0, 1.0}; - -+#ifndef HAVE_SINCOS -+static void -+sincos (double x, double *sinx, double *cosx) -+{ -+ *sinx = sin (x); -+ *cosx = cos (x); -+} -+#endif /* HAVE_SINCOS */ -+ - /** - * Fills a gear vertex. - * -diff --git a/examples/cogl-hello.c b/examples/cogl-hello.c -index 5bda9bf..3ba1e31 100644 ---- a/examples/cogl-hello.c -+++ b/examples/cogl-hello.c -@@ -39,7 +39,7 @@ main (int argc, char **argv) - CoglOnscreen *onscreen; - CoglError *error = NULL; - CoglVertexP2C4 triangle_vertices[] = { -- {0, 0.7, 0xff, 0x00, 0x00, 0x80}, -+ {0, 0.7, 0xff, 0x00, 0x00, 0xff}, - {-0.7, -0.7, 0x00, 0xff, 0x00, 0xff}, - {0.7, -0.7, 0x00, 0x00, 0xff, 0xff} - }; -diff --git a/examples/cogl-msaa.c b/examples/cogl-msaa.c -index 73f9c4e..4a388bc 100644 ---- a/examples/cogl-msaa.c -+++ b/examples/cogl-msaa.c -@@ -12,7 +12,7 @@ main (int argc, char **argv) - CoglFramebuffer *fb; - CoglError *error = NULL; - CoglVertexP2C4 triangle_vertices[] = { -- {0, 0.7, 0xff, 0x00, 0x00, 0x80}, -+ {0, 0.7, 0xff, 0x00, 0x00, 0xff}, - {-0.7, -0.7, 0x00, 0xff, 0x00, 0xff}, - {0.7, -0.7, 0x00, 0x00, 0xff, 0xff} - }; -diff --git a/examples/cogl-sdl-hello.c b/examples/cogl-sdl-hello.c -index 961137a..acb9125 100644 ---- a/examples/cogl-sdl-hello.c -+++ b/examples/cogl-sdl-hello.c -@@ -80,7 +80,7 @@ main (int argc, char **argv) - CoglOnscreen *onscreen; - CoglError *error = NULL; - CoglVertexP2C4 triangle_vertices[] = { -- {0, 0.7, 0xff, 0x00, 0x00, 0x80}, -+ {0, 0.7, 0xff, 0x00, 0x00, 0xff}, - {-0.7, -0.7, 0x00, 0xff, 0x00, 0xff}, - {0.7, -0.7, 0x00, 0x00, 0xff, 0xff} - }; -diff --git a/examples/cogl-sdl2-hello.c b/examples/cogl-sdl2-hello.c -index 405cb92..12e6ced 100644 ---- a/examples/cogl-sdl2-hello.c -+++ b/examples/cogl-sdl2-hello.c -@@ -89,7 +89,7 @@ main (int argc, char **argv) - CoglOnscreen *onscreen; - CoglError *error = NULL; - CoglVertexP2C4 triangle_vertices[] = { -- {0, 0.7, 0xff, 0x00, 0x00, 0x80}, -+ {0, 0.7, 0xff, 0x00, 0x00, 0xff}, - {-0.7, -0.7, 0x00, 0xff, 0x00, 0xff}, - {0.7, -0.7, 0x00, 0x00, 0xff, 0xff} - }; -diff --git a/examples/cogl-x11-foreign.c b/examples/cogl-x11-foreign.c -index ca9e3ed..a60397c 100644 ---- a/examples/cogl-x11-foreign.c -+++ b/examples/cogl-x11-foreign.c -@@ -61,7 +61,7 @@ main (int argc, char **argv) - unsigned long mask; - Window xwin; - CoglVertexP2C4 triangle_vertices[] = { -- {0, 0.7, 0xff, 0x00, 0x00, 0x80}, -+ {0, 0.7, 0xff, 0x00, 0x00, 0xff}, - {-0.7, -0.7, 0x00, 0xff, 0x00, 0xff}, - {0.7, -0.7, 0x00, 0x00, 0xff, 0xff} - }; -diff --git a/examples/cogland.c b/examples/cogland.c -index c18850a..7a02719 100644 ---- a/examples/cogland.c -+++ b/examples/cogland.c -@@ -93,7 +93,6 @@ struct _CoglandCompositor - struct wl_display *wayland_display; - struct wl_event_loop *wayland_loop; - -- CoglDisplay *cogl_display; - CoglContext *cogl_context; - - int virtual_width; -@@ -336,15 +335,16 @@ cogland_queue_redraw (CoglandCompositor *compositor) - } - - static void --shm_buffer_damaged (CoglandSurface *surface, -- int32_t x, -- int32_t y, -- int32_t width, -- int32_t height) -+surface_damaged (CoglandSurface *surface, -+ int32_t x, -+ int32_t y, -+ int32_t width, -+ int32_t height) - { - struct wl_buffer *wayland_buffer = surface->buffer; - -- if (surface->texture) -+ if (surface->texture && -+ wl_buffer_is_shm (surface->buffer)) - { - CoglPixelFormat format; - int stride = wl_shm_buffer_get_stride (wayland_buffer); -@@ -381,6 +381,8 @@ shm_buffer_damaged (CoglandSurface *surface, - stride, - data); - } -+ -+ cogland_queue_redraw (surface->compositor); - } - - static void -@@ -546,16 +548,18 @@ cogland_surface_commit (struct wl_client *client, - - wl_signal_add (&surface->buffer->resource.destroy_signal, - &surface->buffer_destroy_listener); -- wl_list_remove (&surface->pending.buffer_destroy_listener.link); - } - } -- surface->pending.buffer = NULL; -+ if (surface->pending.buffer) -+ { -+ wl_list_remove (&surface->pending.buffer_destroy_listener.link); -+ surface->pending.buffer = NULL; -+ } - surface->pending.sx = 0; - surface->pending.sy = 0; - - /* wl_surface.damage */ - if (surface->buffer && -- wl_buffer_is_shm (surface->buffer) && - surface->texture && - !region_is_empty (&surface->pending.damage)) - { -@@ -571,11 +575,11 @@ cogland_surface_commit (struct wl_client *client, - if (region->y1 < 0) - region->y1 = 0; - -- shm_buffer_damaged (surface, -- region->x1, -- region->y1, -- region->x2 - region->x1, -- region->y2 - region->y1); -+ surface_damaged (surface, -+ region->x1, -+ region->y1, -+ region->x2 - region->x1, -+ region->y2 - region->y1); - } - region_init (&surface->pending.damage); - -@@ -583,8 +587,6 @@ cogland_surface_commit (struct wl_client *client, - wl_list_insert_list (&compositor->frame_callbacks, - &surface->pending.frame_callback_list); - wl_list_init (&surface->pending.frame_callback_list); -- -- cogland_queue_redraw (compositor); - } - - static void -@@ -614,6 +616,9 @@ cogland_surface_free (CoglandSurface *surface) - compositor->surfaces = g_list_remove (compositor->surfaces, surface); - cogland_surface_detach_buffer_and_notify (surface); - -+ if (surface->pending.buffer) -+ wl_list_remove (&surface->pending.buffer_destroy_listener.link); -+ - wl_list_for_each_safe (cb, next, - &surface->pending.frame_callback_list, link) - wl_resource_destroy (&cb->resource); -@@ -970,7 +975,7 @@ get_shell_surface (struct wl_client *client, - struct wl_resource *surface_resource) - { - CoglandSurface *surface = surface_resource->data; -- CoglandShellSurface *shell_surface = g_new0 (CoglandShellSurface, 1); -+ CoglandShellSurface *shell_surface; - - if (surface->has_shell_surface) - { -@@ -980,6 +985,7 @@ get_shell_surface (struct wl_client *client, - return; - } - -+ shell_surface = g_new0 (CoglandShellSurface, 1); - shell_surface->resource.destroy = destroy_shell_surface; - shell_surface->resource.object.id = id; - shell_surface->resource.object.interface = &wl_shell_surface_interface; -@@ -1012,6 +1018,36 @@ bind_shell (struct wl_client *client, - &cogland_shell_interface, id, data); - } - -+static CoglContext * -+create_cogl_context (CoglandCompositor *compositor, -+ CoglBool use_egl_constraint, -+ CoglError **error) -+{ -+ CoglRenderer *renderer = renderer = cogl_renderer_new (); -+ CoglDisplay *display; -+ CoglContext *context; -+ -+ if (use_egl_constraint) -+ cogl_renderer_add_constraint (renderer, COGL_RENDERER_CONSTRAINT_USES_EGL); -+ -+ if (!cogl_renderer_connect (renderer, error)) -+ { -+ cogl_object_unref (renderer); -+ return NULL; -+ } -+ -+ display = cogl_display_new (renderer, NULL); -+ cogl_wayland_display_set_compositor_display (display, -+ compositor->wayland_display); -+ -+ context = cogl_context_new (display, error); -+ -+ cogl_object_unref (renderer); -+ cogl_object_unref (display); -+ -+ return context; -+} -+ - int - main (int argc, char **argv) - { -@@ -1020,7 +1056,7 @@ main (int argc, char **argv) - CoglError *error = NULL; - GError *gerror = NULL; - CoglVertexP2C4 triangle_vertices[] = { -- {0, 0.7, 0xff, 0x00, 0x00, 0x80}, -+ {0, 0.7, 0xff, 0x00, 0x00, 0xff}, - {-0.7, -0.7, 0x00, 0xff, 0x00, 0xff}, - {0.7, -0.7, 0x00, 0x00, 0xff, 0xff} - }; -@@ -1055,13 +1091,30 @@ main (int argc, char **argv) - wayland_event_source_new (compositor.wayland_display); - g_source_attach (compositor.wayland_event_source, NULL); - -- compositor.cogl_display = cogl_display_new (NULL, NULL); -- cogl_wayland_display_set_compositor_display (compositor.cogl_display, -- compositor.wayland_display); -- -- compositor.cogl_context = cogl_context_new (compositor.cogl_display, &error); -- if (!compositor.cogl_context) -- g_error ("Failed to create a Cogl context: %s\n", error->message); -+ /* We want Cogl to use an EGL renderer because otherwise it won't -+ * set up the wl_drm object and only SHM buffers will work. */ -+ compositor.cogl_context = -+ create_cogl_context (&compositor, -+ TRUE /* use EGL constraint */, -+ &error); -+ if (compositor.cogl_context == NULL) -+ { -+ /* If we couldn't get an EGL context then try any type of -+ * context */ -+ cogl_error_free (error); -+ error = NULL; -+ -+ compositor.cogl_context = -+ create_cogl_context (&compositor, -+ FALSE, /* don't set EGL constraint */ -+ &error); -+ -+ if (compositor.cogl_context) -+ g_warning ("Failed to create context with EGL constraint, " -+ "falling back"); -+ else -+ g_error ("Failed to create a Cogl context: %s\n", error->message); -+ } - - compositor.virtual_width = 800; - compositor.virtual_height = 600; -diff --git a/tests/conform/Makefile.am b/tests/conform/Makefile.am -index 69a460d..9782755 100644 ---- a/tests/conform/Makefile.am -+++ b/tests/conform/Makefile.am -@@ -65,6 +65,7 @@ test_sources = \ - test-framebuffer-get-bits.c \ - test-primitive-and-journal.c \ - test-copy-replace-texture.c \ -+ test-pipeline-cache-unrefs-texture.c \ - $(NULL) - - test_conformance_SOURCES = $(common_sources) $(test_sources) -@@ -131,7 +132,10 @@ AM_CPPFLAGS += \ - -DCOGL_COMPILATION - - test_conformance_CFLAGS = -g3 -O0 $(COGL_DEP_CFLAGS) $(COGL_EXTRA_CFLAGS) --test_conformance_LDADD = $(COGL_DEP_LIBS) $(top_builddir)/cogl/libcogl.la -+test_conformance_LDADD = \ -+ $(COGL_DEP_LIBS) \ -+ $(top_builddir)/cogl/libcogl.la \ -+ $(LIBM) - if !USE_GLIB - test_conformance_LDADD += $(top_builddir)/deps/glib/libglib.la - endif -diff --git a/tests/conform/test-conform-main.c b/tests/conform/test-conform-main.c -index 0b55db6..1d1447e 100644 ---- a/tests/conform/test-conform-main.c -+++ b/tests/conform/test-conform-main.c -@@ -120,6 +120,8 @@ main (int argc, char **argv) - - ADD_TEST (test_copy_replace_texture, 0, 0); - -+ ADD_TEST (test_pipeline_cache_unrefs_texture, 0, 0); -+ - UNPORTED_TEST (test_viewport); - - ADD_TEST (test_gles2_context, TEST_REQUIREMENT_GLES2_CONTEXT, 0); -diff --git a/tests/conform/test-pipeline-cache-unrefs-texture.c b/tests/conform/test-pipeline-cache-unrefs-texture.c -new file mode 100644 -index 0000000..ccd02e7 ---- /dev/null -+++ b/tests/conform/test-pipeline-cache-unrefs-texture.c -@@ -0,0 +1,92 @@ -+#include -+ -+#include "test-utils.h" -+ -+/* Keep track of the number of textures that we've created and are -+ * still alive */ -+static int destroyed_texture_count = 0; -+ -+#define N_TEXTURES 3 -+ -+static void -+free_texture_cb (void *user_data) -+{ -+ destroyed_texture_count++; -+} -+ -+static CoglTexture * -+create_texture (void) -+{ -+ static const guint8 data[] = -+ { 0xff, 0xff, 0xff, 0xff }; -+ static CoglUserDataKey texture_data_key; -+ CoglTexture2D *tex_2d; -+ -+ tex_2d = cogl_texture_2d_new_from_data (test_ctx, -+ 1, 1, /* width / height */ -+ COGL_PIXEL_FORMAT_RGBA_8888_PRE, -+ COGL_PIXEL_FORMAT_ANY, -+ 4, /* rowstride */ -+ data, -+ NULL); -+ -+ /* Set some user data on the texture so we can track when it has -+ * been destroyed */ -+ cogl_object_set_user_data (COGL_OBJECT (tex_2d), -+ &texture_data_key, -+ GINT_TO_POINTER (1), -+ free_texture_cb); -+ -+ return COGL_TEXTURE (tex_2d); -+} -+ -+void -+test_pipeline_cache_unrefs_texture (void) -+{ -+ CoglPipeline *pipeline = cogl_pipeline_new (test_ctx); -+ CoglPipeline *simple_pipeline; -+ int i; -+ -+ /* Create a pipeline with three texture layers. That way we can be -+ * pretty sure the pipeline will cause a unique shader to be -+ * generated in the cache */ -+ for (i = 0; i < N_TEXTURES; i++) -+ { -+ CoglTexture *tex = create_texture (); -+ cogl_pipeline_set_layer_texture (pipeline, i, tex); -+ cogl_object_unref (tex); -+ } -+ -+ /* Draw something with the pipeline to ensure it gets into the -+ * pipeline cache */ -+ cogl_framebuffer_draw_rectangle (test_fb, -+ pipeline, -+ 0, 0, 10, 10); -+ cogl_framebuffer_finish (test_fb); -+ -+ /* Draw something else so that it is no longer the current flushed -+ * pipeline, and the units have a different texture bound */ -+ simple_pipeline = cogl_pipeline_new (test_ctx); -+ for (i = 0; i < N_TEXTURES; i++) -+ { -+ CoglColor combine_constant; -+ cogl_color_init_from_4ub (&combine_constant, i, 0, 0, 255); -+ cogl_pipeline_set_layer_combine_constant (simple_pipeline, -+ i, -+ &combine_constant); -+ } -+ cogl_framebuffer_draw_rectangle (test_fb, simple_pipeline, 0, 0, 10, 10); -+ cogl_framebuffer_finish (test_fb); -+ cogl_object_unref (simple_pipeline); -+ -+ g_assert_cmpint (destroyed_texture_count, ==, 0); -+ -+ /* Destroy the pipeline. This should immediately cause the textures -+ * to be freed */ -+ cogl_object_unref (pipeline); -+ -+ g_assert_cmpint (destroyed_texture_count, ==, N_TEXTURES); -+ -+ if (cogl_test_verbose ()) -+ g_print ("OK\n"); -+} -diff --git a/tests/micro-perf/Makefile.am b/tests/micro-perf/Makefile.am -index c221dd6..5c5f69d 100644 ---- a/tests/micro-perf/Makefile.am -+++ b/tests/micro-perf/Makefile.am -@@ -19,5 +19,10 @@ endif - - AM_CFLAGS = $(COGL_DEP_CFLAGS) $(COGL_EXTRA_CFLAGS) - -+common_ldadd = \ -+ $(COGL_DEP_LIBS) \ -+ $(top_builddir)/cogl/libcogl.la \ -+ $(LIBM) -+ - test_journal_SOURCES = test-journal.c --test_journal_LDADD = $(COGL_DEP_LIBS) $(top_builddir)/cogl/libcogl.la -+test_journal_LDADD = $(common_ldadd) diff --git a/srcpkgs/cogl/patches/cogl-1.14.0-21-ge26464f.patch.args b/srcpkgs/cogl/patches/cogl-1.14.0-21-ge26464f.patch.args deleted file mode 100644 index 2eba1cb3c5c..00000000000 --- a/srcpkgs/cogl/patches/cogl-1.14.0-21-ge26464f.patch.args +++ /dev/null @@ -1 +0,0 @@ --Np1 diff --git a/srcpkgs/cogl/template b/srcpkgs/cogl/template index 9cf63ea9c3a..3a2da8ec680 100644 --- a/srcpkgs/cogl/template +++ b/srcpkgs/cogl/template @@ -1,21 +1,18 @@ # Template file for 'cogl' pkgname=cogl -version=1.14.0 -revision=3 +version=1.16.0 +revision=1 build_style=gnu-configure -configure_args="--enable-introspection" -hostmakedepends="pkg-config intltool automake libtool gettext-devel gobject-introspection" -makedepends="libXcomposite-devel libXrandr-devel libXdamage-devel pango-devel gdk-pixbuf-devel" +configure_args="--enable-introspection --enable-cogl-gst=yes" +hostmakedepends="pkg-config intltool gobject-introspection" +makedepends="libXcomposite-devel libXrandr-devel libXdamage-devel pango-devel + gdk-pixbuf-devel gst-plugins-base1-devel>=1:1.2.0" short_desc="Library for using 3D graphics hardware for rendering" maintainer="Juan RP " homepage="http://www.clutter-project.org" license="LGPL-2.1" distfiles="${GNOME_SITE}/cogl/${version%.*}/cogl-${version}.tar.xz" -checksum=276e8c9f5ff0fcd57c1eaf74cc245f41ad469a95a18ac831fac2d5960baa5ae8 - -pre_configure() { - autoreconf -fi -} +checksum=75c2c4636a050fda7ee8722ce3d9c618b08799ed92bbb72b4fdff3e73b096094 cogl-devel_package() { depends="libdrm-devel libXcomposite-devel libXdamage-devel @@ -30,7 +27,8 @@ cogl-devel_package() { } cogl_package() { + depends="gst-plugins-base1>=1:1.2.0" pkg_install() { - vmove usr + vmove all } } From c7b5d88a2a4f87d400dcabd88d0f6ac164aa0586 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Thu, 26 Sep 2013 13:22:16 +0200 Subject: [PATCH 009/159] clutter: update to 1.16.0. --- srcpkgs/clutter/template | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/srcpkgs/clutter/template b/srcpkgs/clutter/template index 55f10535b44..cdcabaa51ea 100644 --- a/srcpkgs/clutter/template +++ b/srcpkgs/clutter/template @@ -1,29 +1,30 @@ # Template file for 'clutter' pkgname=clutter -version=1.14.4 +version=1.16.0 revision=1 build_style=gnu-configure configure_args="--enable-introspection" hostmakedepends="pkg-config intltool gobject-introspection" -makedepends="atk-devel pango-devel libXi-devel libXcomposite-devel json-glib-devel cogl-devel>=1.14" +makedepends="atk-devel pango-devel libXi-devel libXcomposite-devel json-glib-devel cogl-devel>=1.16" short_desc="OpenGL based interactive canvas library" maintainer="Juan RP " homepage="http://www.clutter-project.org" license="LGPL-2.1" distfiles="${GNOME_SITE}/clutter/${version%.*}/clutter-${version}.tar.xz" -checksum=c996d91fff6fff24d9e23dcd545439ebc6b999fb1cf9ee44c28ca54c49c0ee1c +checksum=a213c7859051d6d19b5550c7e433757a35aa8e2b61a43d2eae83dd87912ea8ae long_desc=" Clutter is an open source software library for creating fast, visually rich and animated graphical user interfaces." clutter-devel_package() { - depends="cogl-devel>=1.14 cairo-devel atk-devel pango-devel json-glib-devel + depends="cogl-devel>=1.16 cairo-devel atk-devel pango-devel json-glib-devel libX11-devel libXext-devel libXfixes-devel libXdamage-devel libXcomposite-devel libXi-devel clutter-${version}_${revision}" short_desc+=" - development files" pkg_install() { vmove usr/include vmove usr/lib/pkgconfig + vmove "usr/lib/*.so" vmove usr/share/gtk-doc vmove "usr/share/gir-*" } From 5b42e5b3f3ec1958a86056e34a4ad29f1a409161 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Thu, 26 Sep 2013 13:24:46 +0200 Subject: [PATCH 010/159] clutter-gtk: rebuild against cogl/clutter 1.16. --- srcpkgs/clutter-gtk/template | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/srcpkgs/clutter-gtk/template b/srcpkgs/clutter-gtk/template index 57e7ce0b645..3b29d4689d7 100644 --- a/srcpkgs/clutter-gtk/template +++ b/srcpkgs/clutter-gtk/template @@ -1,10 +1,10 @@ # Template file for 'clutter-gtk' pkgname=clutter-gtk version=1.4.4 -revision=1 +revision=2 build_style=gnu-configure hostmakedepends="pkg-config intltool gobject-introspection" -makedepends="gtk+3-devel>=3.8.0 clutter-devel>=1.14" +makedepends="gtk+3-devel>=3.8.0 cogl-devel>=1.16 clutter-devel>=1.16" short_desc="GTK+3 bindings for the Clutter Tolkit" maintainer="Juan RP " homepage="http://clutter-project.org/" @@ -13,19 +13,19 @@ distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" checksum=bc3108594a01a08bb6d9b538afe995e4fd78634a8356064ee8137d87aad51b2e clutter-gtk-devel_package() { - depends="gtk+3-devel>=3.8.0 clutter-devel>=1.14 ${sourcepkg}-${version}_${revision}" + depends="gtk+3-devel>=3.8 clutter-devel>=1.16 ${sourcepkg}-${version}_${revision}" short_desc="${short_desc} - development files" pkg_install() { vmove usr/include vmove usr/lib/pkgconfig + vmove "usr/lib/*.so" vmove usr/share/gir-1.0 vmove usr/share/gtk-doc } } clutter-gtk_package() { - depends="gtk+3>=3.8.0" pkg_install() { - vmove usr + vmove all } } From 3136903bf60b4418884be2020d11cc7d20807bd5 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Thu, 26 Sep 2013 13:26:57 +0200 Subject: [PATCH 011/159] clutter-gst: rebuild against cogl/clutter 1.16. --- srcpkgs/clutter-gst/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/clutter-gst/template b/srcpkgs/clutter-gst/template index 17c2bc3f4e5..61de6911286 100644 --- a/srcpkgs/clutter-gst/template +++ b/srcpkgs/clutter-gst/template @@ -1,11 +1,11 @@ # Template file for 'clutter-gst' pkgname=clutter-gst version=2.0.8 -revision=1 +revision=2 build_style=gnu-configure configure_args="--disable-debug" hostmakedepends="pkg-config intltool gobject-introspection" -makedepends="clutter-devel>=1.14 gst-plugins-bad1-devel>=1:1.0.10" +makedepends="clutter-devel>=1.16 gst-plugins-bad1-devel>=1:1.2.0" short_desc="GStreamer bindings for the Clutter Toolkit" maintainer="Juan RP " homepage="http://www.gtk.org/" @@ -14,7 +14,7 @@ distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" checksum=cee6b0667c74a54fdf43f0ec7c1dc8ff0ffd1c594e0d43529de45048f8080a4d clutter-gst-devel_package() { - depends="clutter-devel>=1.14 gst-plugins-bad1-devel>=1:1.0.10 ${sourcepkg}-${version}_${revision}" + depends="clutter-devel>=1.16 gst-plugins-bad1-devel>=1:1.2.0 ${sourcepkg}-${version}_${revision}" short_desc+=" - development files" pkg_install() { vmove usr/include @@ -26,7 +26,7 @@ clutter-gst-devel_package() { } clutter-gst_package() { - depends="gst-plugins-base1>=1:1.0.10 gst-plugins-bad1>=1:1.0.10" + depends="gst-plugins-base1>=1:1.2 gst-plugins-bad1>=1:1.2" pkg_install() { vmove all } From 12c3fffe3d2fb89c9b6cf47fcb467f95326a1e74 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Thu, 26 Sep 2013 13:34:02 +0200 Subject: [PATCH 012/159] gsettings-desktop-schemas: update to 3.10.0. --- srcpkgs/gsettings-desktop-schemas/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/gsettings-desktop-schemas/template b/srcpkgs/gsettings-desktop-schemas/template index 21864c9b34e..bd178f0b441 100644 --- a/srcpkgs/gsettings-desktop-schemas/template +++ b/srcpkgs/gsettings-desktop-schemas/template @@ -1,6 +1,6 @@ # Template file for 'gsettings-desktop-schemas' pkgname=gsettings-desktop-schemas -version=3.8.2 +version=3.10.0 revision=1 build_style=gnu-configure hostmakedepends="pkg-config intltool gobject-introspection" @@ -10,7 +10,7 @@ maintainer="Juan RP " license="GPL-2" homepage="http://www.gnome.org" distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" -checksum=86070b2a4e1ab5a28f81b8fd413434eadc1f8505cbf14886d150eb925f93c827 +checksum=ca681596b0fd35a061c50bf99a5f5bdcf245ccc60019895edd2aef9f79c7a8ce long_desc=" ${pkgname} contains a collection of GSettings schemas for settings shared by various components of a desktop." From ab62b3a73d71d57a1abd1dda0a6832ddf330b0a8 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Thu, 26 Sep 2013 13:38:29 +0200 Subject: [PATCH 013/159] dconf: update to 0.18.0. --- srcpkgs/dconf/template | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/srcpkgs/dconf/template b/srcpkgs/dconf/template index 2c12831f5b4..3b9c34965e3 100644 --- a/srcpkgs/dconf/template +++ b/srcpkgs/dconf/template @@ -1,16 +1,16 @@ # Template file for 'dconf' pkgname=dconf -version=0.16.1 +version=0.18.0 revision=1 build_style=gnu-configure hostmakedepends="pkg-config intltool libxslt docbook-xsl" -makedepends="vala-devel>=0.20 dbus-devel gtk+3-devel libxml2-devel" +makedepends="vala-devel dbus-devel gtk+3-devel libxml2-devel" short_desc="A low-level configuration system" maintainer="Juan RP " homepage="http://live.gnome.org/dconf" license="LGPL-2.1" distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" -checksum=a551d04d06599ee9adde500c71ad8567d68f45420b6dbca10ca51e2834d80fee +checksum=109b1bc6078690af1ed88cb144ef5c5aee7304769d8bdc82ed48c3696f10c955 long_desc=" dconf is a low-level configuration system. Its main purpose is to provide a backend to GSettings on platforms that don't already have configuration @@ -32,13 +32,13 @@ dconf-editor_package() { short_desc+=" - GTK+ editor" pkg_install() { vmove usr/bin/dconf-editor - vmove usr/share/dconf-editor vmove usr/share/applications + vmove usr/share/man/man1/dconf-editor.1 } } dconf_package() { pkg_install() { - vmove usr + vmove all } } From 52aee0546f22917b976eee4337f4b5c6337f4de9 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Thu, 26 Sep 2013 13:54:34 +0200 Subject: [PATCH 014/159] New package: mozjs17-17.0.0. --- common/shlibs | 1 + srcpkgs/mozjs17-devel | 1 + srcpkgs/mozjs17/template | 38 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 40 insertions(+) create mode 120000 srcpkgs/mozjs17-devel create mode 100644 srcpkgs/mozjs17/template diff --git a/common/shlibs b/common/shlibs index 98cb5233998..459a3e2304f 100644 --- a/common/shlibs +++ b/common/shlibs @@ -1413,3 +1413,4 @@ libnet.so.1 libnet-1.1.6_1 libthreadutil.so.6 libupnp-1.6.18_1 libixml.so.2 libupnp-1.6.18_1 libupnp.so.6 libupnp-1.6.18_1 +libmozjs-17.0.so mozjs17-17.0.0_1 diff --git a/srcpkgs/mozjs17-devel b/srcpkgs/mozjs17-devel new file mode 120000 index 00000000000..8fc3e7618a1 --- /dev/null +++ b/srcpkgs/mozjs17-devel @@ -0,0 +1 @@ +mozjs17 \ No newline at end of file diff --git a/srcpkgs/mozjs17/template b/srcpkgs/mozjs17/template new file mode 100644 index 00000000000..1b16c669af4 --- /dev/null +++ b/srcpkgs/mozjs17/template @@ -0,0 +1,38 @@ +# Template file for 'mozjs17' +pkgname=mozjs17 +version=17.0.0 +revision=1 +wrksrc="mozjs${version}" +build_wrksrc="js/src" +build_style=gnu-configure +configure_args="--with-system-nspr --enable-threadsafe" +hostmakedepends="zip python perl" +makedepends="zlib-devel nspr-devel libedit-devel libffi-devel" +short_desc="Mozilla JavaScript interpreter and library" +homepage="http://www.mozilla.org/js/" +license="MPL-1.1, GPL-2, LGPL-2.1" +maintainer="Juan RP " +distfiles="${MOZILLA_SITE}/js/mozjs${version}.tar.gz" +checksum=321e964fe9386785d3bf80870640f2fa1c683e32fe988eeb201b04471c172fba +long_desc=" + JavaScript is the Netscape-developed object scripting language used in millions + of web pages and server applications worldwide. Netscape's JavaScript is a + superset of the ECMA-262 Edition 3 (ECMAScript) standard scripting language, + with only mild differences from the published standard." + +mozjs17-devel_package() { + depends="nspr-devel ${sourcepkg}>=${version}" + short_desc+=" - development files" + pkg_install() { + vmove usr/bin/js17-config + vmove usr/include + vmove "usr/lib/*.a" + vmove usr/lib/pkgconfig + } +} + +mozjs17_package() { + pkg_install() { + vmove all + } +} From c937f40c046a618f35b4a91ba76d6c8afeca450f Mon Sep 17 00:00:00 2001 From: Juan RP Date: Thu, 26 Sep 2013 13:57:17 +0200 Subject: [PATCH 015/159] gjs: update to 1.38.1. --- srcpkgs/gjs/template | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/srcpkgs/gjs/template b/srcpkgs/gjs/template index fe6846acdb0..6bac40ad9d6 100644 --- a/srcpkgs/gjs/template +++ b/srcpkgs/gjs/template @@ -1,29 +1,29 @@ # Template file for 'gjs' pkgname=gjs -version=1.36.1 +version=1.38.1 revision=1 build_style=gnu-configure hostmakedepends="pkg-config intltool gobject-introspection" makedepends="libffi-devel libgirepository-devel dbus-glib-devel - cairo-devel readline-devel js-devel" + cairo-devel readline-devel mozjs17-devel" short_desc="Mozilla-based javascript bindings for the GNOME platform" maintainer="Juan RP " license="MPL-1.1, LGPL-2.1, GPL-2" homepage="http://live.gnome.org/Gjs" -distfiles="${GNOME_SITE}/$pkgname/1.36/$pkgname-$version.tar.xz" -checksum=d259ef2d702fa9cc9948a35d0e701706d90798fd2855657b7e9ddc9a44dfcf87 +distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" +checksum=6b2065a0e7bd1db562a70c5fd52ea2499097f1cf02c9c279d1b82b660bfb8176 long_desc=" Makes it possible for applications to use all of GNOME's platform libraries using the Javascript language. It's mainly based on the Mozilla javascript engine and the GObject introsepection framework." gjs-devel_package() { - depends="libffi-devel libgirepository-devel dbus-glib-devel cairo-devel - readline-devel js-devel gjs>=${version}" + depends="libgirepository-devel mozjs17-devel gjs>=${version}" short_desc+=" - development files" pkg_install() { vmove usr/include vmove usr/lib/pkgconfig + vmove "usr/lib/*.so" } } From e5b516f40a11cae7a27728ed9c39603a51f7d940 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Thu, 26 Sep 2013 14:16:03 +0200 Subject: [PATCH 016/159] libgee08: update to 0.12.0. --- srcpkgs/libgee08/template | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/srcpkgs/libgee08/template b/srcpkgs/libgee08/template index f2e389e9180..abb9e80cc6a 100644 --- a/srcpkgs/libgee08/template +++ b/srcpkgs/libgee08/template @@ -1,18 +1,18 @@ # Template file for 'libgee08' pkgname=libgee08 -version=0.10.5 +version=0.12.0 wrksrc=libgee-${version} revision=1 build_style=gnu-configure configure_args="--disable-static" hostmakedepends="pkg-config intltool gobject-introspection" -makedepends="libglib-devel vala-devel>=0.20" +makedepends="libglib-devel vala-devel>=0.22" short_desc="GObject collection library (0.8.x API)" maintainer="Juan RP " license="LGPL-2.1" homepage="http://live.gnome.org/Libgee" -distfiles="${GNOME_SITE}/libgee/0.10/libgee-${version}.tar.xz" -checksum=84d801cac35cb93ae779e77cab8c379c31a3b30b55a5fb021af2008a38f87b15 +distfiles="${GNOME_SITE}/libgee/${version%.*}/libgee-${version}.tar.xz" +checksum=d106ed63fe0da5d5ee89aa8197a373cf9a2b96688cc3060144bfc0a022496ea5 libgee08-devel_package() { depends="libglib-devel ${sourcepkg}-${version}_${revision}" @@ -28,6 +28,6 @@ libgee08-devel_package() { libgee08_package() { pkg_install() { - vmove usr + vmove all } } From a26e0a2ecc1dc5d1421060e74bf1d2be0617b3d1 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Thu, 26 Sep 2013 14:18:50 +0200 Subject: [PATCH 017/159] baobab: update to 3.10. --- srcpkgs/baobab/template | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/srcpkgs/baobab/template b/srcpkgs/baobab/template index e5d210c8b13..b006b4dc54a 100644 --- a/srcpkgs/baobab/template +++ b/srcpkgs/baobab/template @@ -1,21 +1,21 @@ # Template file for 'baobab' pkgname=baobab -version=3.8.2 +version=3.10 revision=1 build_style=gnu-configure configure_args="--disable-schemas-compile" hostmakedepends="pkg-config intltool itstool gnome-doc-utils gobject-introspection" -makedepends="gtk+3-devel vala-devel>=0.20 gsettings-desktop-schemas-devel>=3.8" +makedepends="gtk+3-devel vala-devel>=0.22 gsettings-desktop-schemas-devel>=3.10" short_desc="A graphical directory tree analyzer for GNOME" maintainer="Juan RP " homepage="http://www.gnome.org" license="GPL-2" -distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" -checksum=68ce73e34378909a384d17355d2b80c14423dc54ace6a363dc93653cf608614a +distfiles="${GNOME_SITE}/$pkgname/${version}/$pkgname-$version.tar.xz" +checksum=6f4e309073c3834f957b957b03d388fd89900a1622a001d238ad6105c6e303ee baobab_package() { replaces="gnome-utils>=3.0" - depends="hicolor-icon-theme desktop-file-utils gsettings-desktop-schemas>=3.8.0" + depends="hicolor-icon-theme desktop-file-utils gsettings-desktop-schemas>=3.10" pkg_install() { vmove all } From a8051e1a4cda971b88a9f1a4df4f9e21751c7b64 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Thu, 26 Sep 2013 14:26:34 +0200 Subject: [PATCH 018/159] libsoup: update to 2.44.0. --- srcpkgs/libsoup/template | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/srcpkgs/libsoup/template b/srcpkgs/libsoup/template index 4a12fd74198..3f0a02436cf 100644 --- a/srcpkgs/libsoup/template +++ b/srcpkgs/libsoup/template @@ -1,6 +1,6 @@ # Template file for 'libsoup' pkgname=libsoup -version=2.42.2 +version=2.44.0 revision=1 build_style=gnu-configure configure_args="--disable-static" @@ -10,34 +10,36 @@ short_desc="HTTP library implementation in C" maintainer="Juan RP " homepage="http://www.gnome.org" license="LGPL-2.1" -distfiles="${GNOME_SITE}/$pkgname/2.42/$pkgname-$version.tar.xz" -checksum=1f4f9cc55ba483dc8defea0c3f97cc507dc48384c5529179e29c1e6d05630dbf +distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" +checksum=2ed9b200bda39c686d19eb4a0a5464e9166d09cbb3ced5a689c78214e83b5c27 libsoup-devel_package() { depends="libglib-devel libxml2-devel libsoup-${version}_${revision}" - short_desc="HTTP library implementation in C -- development files" + short_desc+=" - development files" pkg_install() { vmove usr/lib/pkgconfig/libsoup-2.4.pc vmove usr/share/gir-1.0/Soup-2.4.gir vmove usr/include/libsoup-2.4 vmove usr/share/gtk-doc + vmove "usr/lib/libsoup-2.4.so" } } libsoup-gnome-devel_package() { depends="libsoup-devel-${version}_${revision} libsoup-gnome-${version}_${revision}" - short_desc="HTTP library implementation in C - GNOME development files" + short_desc+=" - GNOME development files" pkg_install() { vmove "usr/include/libsoup-gnome*" vmove "usr/lib/pkgconfig/*gnome*" vmove "usr/share/gir-1.0/SoupGNOME*" + vmove "usr/lib/libsoup-gnome*.so" } } libsoup-gnome_package() { - short_desc="HTTP library implementation in C - GNOME libraries" + short_desc+=" - GNOME libraries" pkg_install() { - vmove "usr/lib/libsoup-gnome*.so*" + vmove "usr/lib/libsoup-gnome*.so.*" vmove "usr/lib/girepository-1.0/SoupGNOME*" } } From 43b002a3ed4226c599e45c5716bee73a4aa44201 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Thu, 26 Sep 2013 14:49:34 +0200 Subject: [PATCH 019/159] libsigc++: update to 2.3.1. --- srcpkgs/libsigc++/template | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/srcpkgs/libsigc++/template b/srcpkgs/libsigc++/template index 79aedb6e933..b6ead460a9d 100644 --- a/srcpkgs/libsigc++/template +++ b/srcpkgs/libsigc++/template @@ -1,15 +1,15 @@ # Template file for 'libsigc++' pkgname=libsigc++ -version=2.2.11 -revision=2 +version=2.3.1 +revision=1 build_style=gnu-configure configure_args="--enable-static --disable-documentation" short_desc="Type-safe callback system for C++ programs" maintainer="Juan RP " homepage="http://libsigc.sourceforge.net/" license="LGPL-2.1" -distfiles="${GNOME_SITE}/${pkgname}/2.2/${pkgname}-${version}.tar.xz" -checksum=9834045f74f56752c2c6b3cdc195c30ab8314ad22dc8e626d6f67f940f1e4957 +distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" +checksum=67d05852b31fdb267c9fdcecd40b046a11aa54d884435e99e3c60dd20cd60393 long_desc=" libsigc++ implements a full callback system for use in widget libraries, abstract interfaces, and general programming. Originally @@ -23,17 +23,18 @@ long_desc=" libsigc++-devel_package() { depends="libsigc++>=${version}" - short_desc="${short_desc} - development files" + short_desc+=" - development files" pkg_install() { vmove usr/include vmove usr/lib/pkgconfig vmove usr/lib/sigc++-2.0 vmove "usr/lib/*.a" + vmove "usr/lib/*.so" } } libsigc++_package() { pkg_install() { - vmove usr + vmove all } } From 91d2f451c695a061f98b8dc71bf7f3ef0b048f12 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Thu, 26 Sep 2013 14:56:07 +0200 Subject: [PATCH 020/159] librsvg: update to 2.39.0; create new -utils binpkg. --- srcpkgs/librsvg-utils | 1 + srcpkgs/librsvg/template | 25 +++++++++++++++++-------- 2 files changed, 18 insertions(+), 8 deletions(-) create mode 120000 srcpkgs/librsvg-utils diff --git a/srcpkgs/librsvg-utils b/srcpkgs/librsvg-utils new file mode 120000 index 00000000000..787f16db410 --- /dev/null +++ b/srcpkgs/librsvg-utils @@ -0,0 +1 @@ +librsvg \ No newline at end of file diff --git a/srcpkgs/librsvg/template b/srcpkgs/librsvg/template index bb5d8f55830..3d6fbfddb11 100644 --- a/srcpkgs/librsvg/template +++ b/srcpkgs/librsvg/template @@ -1,7 +1,7 @@ # Template build file for 'librsvg'. pkgname=librsvg -version=2.37.0 -revision=2 +version=2.39.0 +revision=1 build_style=gnu-configure configure_args="--disable-static --enable-introspection" hostmakedepends="pkg-config intltool python gobject-introspection" @@ -10,8 +10,8 @@ short_desc="SVG library for GNOME" maintainer="Juan RP " homepage="http://librsvg.sourceforge.net/" license="LGPL-2.1" -distfiles="${GNOME_SITE}/$pkgname/2.37/$pkgname-$version.tar.xz" -checksum=06c57dbcb29369d147b4e6ff4257c42ae5120c504c30fb567a27034ee30fd835 +distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" +checksum=aa47dcde0128eee6e3595d203bc673d9c27389588842f401bf585f31fc65095f long_desc=" librsvg is Raph's scalable vector graphics library. It provides support for SVG graphics, and is used by the GNOME desktop. @@ -20,21 +20,30 @@ long_desc=" loader and a theme engine for the GTK+ toolkit." librsvg-devel_package() { - depends="gdk-pixbuf-devel cairo-devel libcroco-devel - ${sourcepkg}-${version}_${revision}" - short_desc="${short_desc} - development files" + depends="gdk-pixbuf-devel cairo-devel libcroco-devel ${sourcepkg}-${version}_${revision}" + short_desc+=" - development files" pkg_install() { vmove usr/include vmove usr/lib/pkgconfig + vmove "usr/lib/*.so" vmove usr/share/gtk-doc vmove usr/share/gir-1.0 } } +librsvg-utils_package() { + short_desc+=" - utilities" + pkg_install() { + vmove usr/bin/rsvg-view-3 + vmove usr/bin/rsvg-convert + vmove usr/share/man/man1/rsvg-convert.1 + } +} + librsvg_package() { depends="gdk-pixbuf>=2.26.1_2" triggers="gtk-pixbuf-loaders" pkg_install() { - vmove usr + vmove all } } From 8c1e272b9eaaf793c68429e985c70160540c40a6 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Thu, 26 Sep 2013 15:07:01 +0200 Subject: [PATCH 021/159] libpeas: update to 1.9.0. --- srcpkgs/libpeas/template | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/srcpkgs/libpeas/template b/srcpkgs/libpeas/template index bcb5909c9af..7654fbc3b2e 100644 --- a/srcpkgs/libpeas/template +++ b/srcpkgs/libpeas/template @@ -1,18 +1,18 @@ # Template file for 'libpeas' pkgname=libpeas -version=1.8.1 +version=1.9.0 revision=1 build_style=gnu-configure configure_args="--without-demo --disable-demo" hostmakedepends="pkg-config intltool gobject-introspection" -makedepends="vala-devel>=0.20 libgirepository-devel gjs-devel - gtk+3-devel>=3.8 libseed-devel python-devel pygobject-devel" +makedepends="vala-devel>=0.22 libgirepository-devel gjs-devel>=1.38 + gtk+3-devel libseed-devel python-devel pygobject-devel" short_desc="Gobject-based plugins engine" maintainer="Juan RP " homepage="http://www.gtk.org/" license="GPL-2" -distfiles="${GNOME_SITE}/$pkgname/1.8/$pkgname-$version.tar.xz" -checksum=ff0e7cd1f0da5dc1289efdd4662a06188f8f0fb088eac67abe05ffa66ba7751d +distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" +checksum=008747ccdf954dc7b8e3207fffede527a589363541873f906c8e0166f6f7df8d long_desc=" libpeas is a gobject-based plugins engine, and is targetted at giving every application the chance to assume its own extensibility. It is currently used by @@ -34,14 +34,15 @@ libpeas-devel_package() { pkg_install() { vmove usr/include vmove usr/lib/pkgconfig + vmove "usr/lib/*.so" vmove usr/share/gir-1.0 vmove usr/share/gtk-doc } } libpeas_package() { - depends="pygobject hicolor-icon-theme" + depends="pygobject hicolor-icon-theme gjs>=1.38" pkg_install() { - vmove usr + vmove all } } From 06f8b668f5f9fcd9059f5b7a21125e965d306d8d Mon Sep 17 00:00:00 2001 From: Juan RP Date: Thu, 26 Sep 2013 15:12:10 +0200 Subject: [PATCH 022/159] libgweather: update to 3.10.0 (soname bump). --- common/shlibs | 2 +- srcpkgs/libgweather/template | 11 ++++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/common/shlibs b/common/shlibs index 459a3e2304f..f66733bc5fb 100644 --- a/common/shlibs +++ b/common/shlibs @@ -1094,7 +1094,7 @@ libgstbasecamerabinsrc-1.0.so.0 gst-plugins-bad1-1.0.0_1 libgstcodecparsers-1.0.so.0 gst-plugins-bad1-1.0.0_1 libgnome-desktop-3.so.7 gnome-desktop-3.8.0_1 libsecret-1.so.0 libsecret-0.10_1 -libgweather-3.so.3 libgweather-3.8.0_1 +libgweather-3.so.6 libgweather-3.10.0_1 libgnomekbd.so.8 libgnomekbd-3.6.0_1 libgnomekbdui.so.8 libgnomekbd-3.6.0_1 libibus-1.0.so.5 ibus-1.4.99.20120917_1 diff --git a/srcpkgs/libgweather/template b/srcpkgs/libgweather/template index d6b4277fd3d..17f7f29577f 100644 --- a/srcpkgs/libgweather/template +++ b/srcpkgs/libgweather/template @@ -1,19 +1,18 @@ # Template file for 'libgweather' pkgname=libgweather -version=3.8.2 +version=3.10.0 revision=1 build_style=gnu-configure configure_args="--disable-schemas-compile --enable-locations-compression --with-zoneinfo-dir=/usr/share/zoneinfo" hostmakedepends="pkg-config intltool gobject-introspection" -makedepends="libxml2-devel libsoup-gnome-devel gtk+3-devel>=3.8.0 - gnome-icon-theme" +makedepends="libxml2-devel libsoup-gnome-devel gtk+3-devel>=3.10 vala-devel gnome-icon-theme" short_desc="GNOME Weather information access library" maintainer="Juan RP " license="LGPL-2.1" homepage="http://www.gnome.org/" -distfiles="${GNOME_SITE}/$pkgname/3.8/$pkgname-$version.tar.xz" -checksum=b053c1328d756a6c653e44464b7a41bec451752fa9686ade32e2e4c6e2a6deb5 +distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" +checksum=4feab6e5c6eb4df85e7d134982a18a6196e63bc8179cfe5a25fc727482c52996 long_desc=" libgweather is a library to access weather information from online services for numerous locations." @@ -25,8 +24,10 @@ libgweather-devel_package() { pkg_install() { vmove usr/include vmove usr/lib/pkgconfig + vmove "usr/lib/*.so" vmove usr/share/gir-1.0 vmove usr/share/gtk-doc + vmove usr/share/vala } } From 1a04d873261a9b6c417a103153ea6ccedd47c8b3 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Thu, 26 Sep 2013 15:14:49 +0200 Subject: [PATCH 023/159] libgnome-keyring: update to 3.10.0. --- srcpkgs/libgnome-keyring/template | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/srcpkgs/libgnome-keyring/template b/srcpkgs/libgnome-keyring/template index 46a5b1a6fbb..1fad0ccd315 100644 --- a/srcpkgs/libgnome-keyring/template +++ b/srcpkgs/libgnome-keyring/template @@ -1,17 +1,16 @@ # Template file for 'libgnome-keyring' pkgname=libgnome-keyring -version=3.8.0 -revision=2 +version=3.10.0 +revision=1 build_style=gnu-configure -configure_args="--disable-debug" hostmakedepends="pkg-config intltool gobject-introspection" makedepends="dbus-devel libglib-devel libgcrypt-devel" short_desc="GNOME keyring client library" maintainer="Juan RP " homepage="http://www.gnome.org" license="GPL-2, LGPL-2.1" -distfiles="${GNOME_SITE}/$pkgname/3.8/$pkgname-$version.tar.xz" -checksum=a8646f2bc62ef903be422946a6356b0718f7a4cbb29b5bdd35a84136f6b82f76 +distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" +checksum=3984e99338e6e610af320a637fa84fb9e795226cfd633d7c0db452c5ae43b560 long_desc=" libgnome-keyring is a program that keeps passwords and other secrets for users. It is run as a damon in the session, similar to ssh-agent, and @@ -23,10 +22,11 @@ long_desc=" libgnome-keyring-devel_package() { depends="libglib-devel ${sourcepkg}>=${version}" - short_desc="${short_desc} -- development files" + short_desc+=" - development files" pkg_install() { vmove usr/include vmove usr/lib/pkgconfig + vmove "usr/lib/*.so" vmove usr/share/gir-1.0 vmove usr/share/gtk-doc } @@ -34,6 +34,6 @@ libgnome-keyring-devel_package() { libgnome-keyring_package() { pkg_install() { - vmove usr + vmove all } } From 3416c63536f4f934fb00f2e4f66357cb7491713d Mon Sep 17 00:00:00 2001 From: Juan RP Date: Thu, 26 Sep 2013 15:19:45 +0200 Subject: [PATCH 024/159] gcr: update to 3.10.0. --- srcpkgs/gcr/template | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/srcpkgs/gcr/template b/srcpkgs/gcr/template index 9145daead84..a5d15e543fe 100644 --- a/srcpkgs/gcr/template +++ b/srcpkgs/gcr/template @@ -1,17 +1,19 @@ # Template file for 'gcr' pkgname=gcr -version=3.8.2 +version=3.10.0 revision=1 build_style=gnu-configure -configure_args="--disable-debug --disable-update-mime - --disable-update-icon-cache --disable-schemas-compile - --enable-introspection" +configure_args="--enable-introspection --disable-update-mime + --disable-update-icon-cache --disable-schemas-compile" +hostmakedepends="which pkg-config intltool gnome-doc-utils + gobject-introspection libtasn1-tools gnupg perl-XML-Parser" +makedepends="gtk+3-devel p11-kit-devel libgcrypt-devel vala-devel" short_desc="GNOME crypto package" maintainer="Juan RP " license="GPL-2, LGPL-2.1" homepage="http://www.gnome.org" -distfiles="${GNOME_SITE}/gcr/3.8/gcr-${version}.tar.xz" -checksum=a1e615ce2cfd375f383bbdd289935a8e3e16901c3c6f032780847055e8bec2c1 +distfiles="${GNOME_SITE}/gcr/${version%.*}/gcr-${version}.tar.xz" +checksum=b689c679b244c1f47d773002c33dadc4111cddeb05bc2f3651826893fd43ff1b long_desc=" GCR is a library for displaying certificates, and crypto UI, accessing key stores. It also provides the viewer for crypto files on the GNOME @@ -20,10 +22,6 @@ long_desc=" GCK is a library for accessing PKCS#11 modules like smart cards, in a (G)object oriented way." -hostmakedepends="which pkg-config intltool gnome-doc-utils - gobject-introspection libtasn1-tools gobject-introspection gnupg" -makedepends="gtk+3-devel>=3.8.0 p11-kit-devel libgcrypt-devel perl-XML-Parser" - post_install() { vinstall ${FILESDIR}/10-gcr-memlock.conf 644 etc/security/limits.d } @@ -37,6 +35,8 @@ gcr-devel_package() { vmove usr/lib/pkgconfig vmove usr/share/gtk-doc vmove usr/share/gir-1.0 + vmove usr/share/vala + vmove "usr/lib/*.so" } } From 0195759567b86b5c696dc1d4dedfbc83be17c030 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Thu, 26 Sep 2013 16:02:02 +0200 Subject: [PATCH 025/159] webkitgtk: update to 2.1.92. --- common/shlibs | 2 +- srcpkgs/webkitgtk/template | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/common/shlibs b/common/shlibs index f66733bc5fb..dee5608ce78 100644 --- a/common/shlibs +++ b/common/shlibs @@ -484,7 +484,7 @@ libwebkitgtk-1.0.so.0 webkit-gtk-1.3.12_1 libwebkitgtk-3.0.so.0 webkitgtk-2.0.0_1 libjavascriptcoregtk-1.0.so.0 webkit-gtk-1.3.12_1 libjavascriptcoregtk-3.0.so.0 webkitgtk-2.0.0_1 -libwebkit2gtk-3.0.so.25 webkitgtk-2.0.0._1 +libwebkit2gtk-3.0.so.25 webkitgtk-2.0.0_1 libgimp-2.0.so.0 gimp-2.6.6_1 libgimpwidgets-2.0.so.0 gimp-2.6.6_1 libgimpui-2.0.so.0 gimp-2.6.6_1 diff --git a/srcpkgs/webkitgtk/template b/srcpkgs/webkitgtk/template index 1b72827aeb2..e5e284e8212 100644 --- a/srcpkgs/webkitgtk/template +++ b/srcpkgs/webkitgtk/template @@ -1,7 +1,7 @@ # Template file for 'webkitgtk' pkgname=webkitgtk -version=2.0.4 -revision=2 +version=2.1.92 +revision=1 build_style=gnu-configure configure_args="--with-gtk=3.0 --enable-introspection" short_desc="GTK+3 port of the WebKit browser engine" @@ -9,7 +9,7 @@ maintainer="Juan RP " homepage="http://webkitgtk.org/" license="LGPL-2.1, Simplified BSD (2 clause)" distfiles="${homepage}/releases/${pkgname}-${version}.tar.xz" -checksum=bd1550b7f6e1a55f803efe7d64438163ff6c04f02186002cb81d0c090aac734f +checksum=38ba86249bc5fc5c27bfc05405a1966737eecaf0ac7c7f93ce5fc0c0be8ee0ce hostmakedepends="perl pkg-config intltool which gperf flex ruby gobject-introspection" @@ -22,7 +22,7 @@ makedepends="libjpeg-turbo-devel libpng-devel>=1.6 sqlite-devel harfbuzz-devel>= webkitgtk-devel_package() { replaces="webkit-gtk3-devel>=0" provides="webkit-gtk3-devel-${version}" - depends="gtk+3-devel>=3.8 libsoup-devel>=2.42 ${sourcepkg}-${version}_${revision}" + depends="gtk+3-devel libsoup-devel>=2.44 ${sourcepkg}-${version}_${revision}" short_desc+=" - development files" pkg_install() { vmove usr/include From f5909bc34acf2b20af57f23b107c7374acee7724 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Thu, 26 Sep 2013 16:12:00 +0200 Subject: [PATCH 026/159] gnome-online-accounts: update to 3.10.0 (soname bump). --- common/shlibs | 2 +- srcpkgs/gnome-online-accounts/template | 15 ++++++++------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/common/shlibs b/common/shlibs index dee5608ce78..fbd4018569e 100644 --- a/common/shlibs +++ b/common/shlibs @@ -804,7 +804,7 @@ libp11-kit.so.0 p11-kit-0.7_1 librest-0.7.so.0 rest-0.7_1 librest-extras-0.7.so.0 rest-0.7_1 libgoa-1.0.so.0 gnome-online-accounts-3.2.0_1 -libgoa-backend-1.0.so.0 gnome-online-accounts-3.2.0_1 +libgoa-backend-1.0.so.1 gnome-online-accounts-3.10.0_1 liboauth.so.0 liboauth-0.9.4_1 libsocialweb.so.0 libsocialweb-0.25.19_1 libsocialweb-keyfob.so.0 libsocialweb-0.25.19_1 diff --git a/srcpkgs/gnome-online-accounts/template b/srcpkgs/gnome-online-accounts/template index 19301ce951d..b8153c7444c 100644 --- a/srcpkgs/gnome-online-accounts/template +++ b/srcpkgs/gnome-online-accounts/template @@ -1,23 +1,24 @@ # Template file for 'gnome-online-accounts' pkgname=gnome-online-accounts -version=3.8.3 +version=3.10.0 revision=1 build_style=gnu-configure configure_args="--enable-google --enable-kerberos --enable-flickr --enable-facebook --disable-static --enable-exchange --enable-imap-smtp - --enable-owncloud --enable-windows-live" + --enable-owncloud --enable-windows-live --enable-twitter --enable-yahoo" hostmakedepends="pkg-config intltool libxslt docbook-xsl gobject-introspection" -makedepends="webkitgtk-devel>=2.0.4_2 json-glib-devel libnotify-devel - rest-devel libsoup-gnome-devel gcr-devel>=3.8.0 libsecret-devel mit-krb5-devel" +makedepends="libsoup-gnome-devel>=2.44 webkitgtk-devel>=2.1 json-glib-devel + libnotify-devel rest-devel gcr-devel>=3.10 libsecret-devel mit-krb5-devel + dbus-glib-devel telepathy-glib-devel" short_desc="GNOME service to access online accounts" maintainer="Juan RP " homepage="http://www.gnome.org" license="GPL-2" -distfiles="${GNOME_SITE}/$pkgname/3.8/$pkgname-$version.tar.xz" -checksum=9e5e55c5097b8d7c32c0dfb7d94448795c627723b133e8edd0b846adde63a44b +distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" +checksum=bba85366632cf5ce777b6889eab505d98d7593c37f7859a312dc57dde05a0feb gnome-online-accounts-devel_package() { - depends="gtk+3-devel>=3.8.0 ${sourcepkg}-${version}_${revision}" + depends="gtk+3-devel ${sourcepkg}-${version}_${revision}" short_desc+=" - development files" pkg_install() { vmove usr/include From 66f20156f8a41dd2a3f0ba43ad1874bdaec4df98 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Thu, 26 Sep 2013 16:15:23 +0200 Subject: [PATCH 027/159] libgdata: update to 0.14.0. --- srcpkgs/libgdata/template | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/srcpkgs/libgdata/template b/srcpkgs/libgdata/template index 46d8a6d837c..ec7a4ea7911 100644 --- a/srcpkgs/libgdata/template +++ b/srcpkgs/libgdata/template @@ -1,38 +1,40 @@ # Template file for 'libgdata' pkgname=libgdata -version=0.13.3 +version=0.14.0 revision=1 build_style=gnu-configure configure_args="--disable-static" hostmakedepends="pkg-config flex intltool gobject-introspection" -makedepends="gtk+3-devel>=3.8 libsoup-gnome-devel liboauth-devel - gcr-devel>=3.8 gnome-online-accounts-devel>=3.8" +makedepends="gtk+3-devel libsoup-gnome-devel>=2.44 liboauth-devel + gcr-devel>=3.10 gnome-online-accounts-devel>=3.10" short_desc="Library for accessing GData webservices" maintainer="Juan RP " license="LGPL-2.1" homepage="http://live.gnome.org/libgdata" -distfiles="${GNOME_SITE}/$pkgname/0.13/$pkgname-$version.tar.xz" -checksum=4bf52706b2ab404f8b128e000509acd9937facf26916d3e907a3db8653f73637 +distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" +checksum=5d415241ae4ca5a2d952bf7f3e9a372be6bb0537b24d83a05e5fc94948d292e9 long_desc=" libgdata is a GLib-based library for accessing online service APIs using the GData protocol — most notably, Google's services. It provides APIs to access the common Google services, and has full asynchronous support." libgdata-devel_package() { - depends="glib-devel libxml2-devel libsoup-devel liboauth-devel - gcr-devel gnome-online-accounts-devel + depends="glib-devel libxml2-devel libsoup-gnome-devel>=2.44 liboauth-devel + gcr-devel>=3.10 gnome-online-accounts-devel>=3.10 libgdata-${version}_${revision}" - short_desc="${short_desc} - development files" + short_desc+=" - development files" pkg_install() { vmove usr/include vmove usr/lib/pkgconfig vmove usr/share/gtk-doc vmove usr/share/gir-1.0 + vmove "usr/lib/*.so" } } libgdata_package() { + depends="libsoup-gnome>=2.44 gnome-online-accounts>=3.10" pkg_install() { - vmove usr + vmove all } } From b5bcad962158a13853c3dcf6d15734b5e8060ca4 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Thu, 26 Sep 2013 16:18:45 +0200 Subject: [PATCH 028/159] gvfs: update to 1.18.0. --- srcpkgs/gvfs/template | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/srcpkgs/gvfs/template b/srcpkgs/gvfs/template index b062bff37ca..7aa06d2cd76 100644 --- a/srcpkgs/gvfs/template +++ b/srcpkgs/gvfs/template @@ -1,6 +1,6 @@ # Template file for 'gvfs' pkgname=gvfs -version=1.16.3 +version=1.18.0 revision=1 build_style=gnu-configure configure_args="--disable-hal --disable-afc @@ -8,16 +8,16 @@ configure_args="--disable-hal --disable-afc hostmakedepends="pkg-config intltool libxslt docbook-xsl gobject-introspection" makedepends="libbluetooth-devel dbus-glib-devel libopenobex-devel libgudev-devel>=183 libexif-devel libbluray-devel - fuse-devel libarchive-devel>=3.1.2 libcdio-devel libsoup-gnome-devel>=2.40 + fuse-devel libarchive-devel>=3.1.2 libcdio-devel libsoup-gnome-devel>=2.44 libgphoto2-devel libsecret-devel gtk+3-devel samba-devel systemd-devel avahi-glib-libs-devel udisks2-devel libgcrypt-devel libmtp-devel - gnome-online-accounts-devel>=3.8" + gnome-online-accounts-devel>=3.10" short_desc="Userspace virtual filesystem" maintainer="Juan RP " homepage="http://www.gnome.org" license="LGPL-2.1" -distfiles="${GNOME_SITE}/$pkgname/1.16/$pkgname-$version.tar.xz" -checksum=02a4483d0dd2e307f58f8e1d34dd29dbe06d3a345b73ac8d6f87bb91189c8e49 +distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" +checksum=a6d9a547ac0621c405251fe929078b2700408cf94371d452f641413d56bd50db post_install() { cd ${DESTDIR}/usr/bin @@ -33,6 +33,6 @@ gvfs-devel_package() { gvfs_package() { pkg_install() { - vmove usr + vmove all } } From 2302a0c8a8d19868a91c74499e7b83d232a81de5 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Thu, 26 Sep 2013 16:21:05 +0200 Subject: [PATCH 029/159] gupnp: update to 0.20.6. --- srcpkgs/gupnp/template | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/srcpkgs/gupnp/template b/srcpkgs/gupnp/template index b50c36676f6..7f3e47f7df7 100644 --- a/srcpkgs/gupnp/template +++ b/srcpkgs/gupnp/template @@ -1,17 +1,17 @@ # Template file for 'gupnp' pkgname=gupnp -version=0.20.5 +version=0.20.6 revision=1 build_style=gnu-configure configure_args="--disable-static" hostmakedepends="pkg-config gobject-introspection" -makedepends="libglib-devel libxml2-devel libuuid-devel gssdp-devel>=0.14.2_2 vala-devel>=0.20" +makedepends="libglib-devel libxml2-devel libuuid-devel gssdp-devel>=0.14.2_2 vala-devel>=0.22" short_desc="GObject-based library for UPnP" maintainer="Juan RP " license="LGPL-2.1" homepage="http://gupnp.org/" -distfiles="${GNOME_SITE}/gupnp/0.20/gupnp-${version}.tar.xz" -checksum=be54bd5f3bfea36d689a5ce70679e51ec3ea3c94677e70ffc7c7ef160bffb260 +distfiles="${GNOME_SITE}/gupnp/${version%.*}/gupnp-${version}.tar.xz" +checksum=1b4ed7de9fdf2da2a5610a0101271f1661706e6481737d7a2ac0f318b5b2dbaa gupnp-devel_package() { depends="gssdp-devel>=0.14.2_2 glib-devel libxml2-devel libuuid-devel gupnp>=${version}" @@ -27,6 +27,6 @@ gupnp-devel_package() { gupnp_package() { pkg_install() { - vmove usr + vmove all } } From 9b0e8b3c7625d80f4fc3b47a41052fd7e2150d22 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Thu, 26 Sep 2013 16:23:29 +0200 Subject: [PATCH 030/159] gucharmap: update to 3.9.99. --- srcpkgs/gucharmap/template | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/srcpkgs/gucharmap/template b/srcpkgs/gucharmap/template index b9501b42de7..7122c52a6c0 100644 --- a/srcpkgs/gucharmap/template +++ b/srcpkgs/gucharmap/template @@ -1,18 +1,18 @@ # Template file for 'gucharmap' pkgname=gucharmap -version=3.8.2 +version=3.9.99 revision=1 build_style=gnu-configure configure_args="--disable-schemas-compile --enable-introspection" hostmakedepends="which pkg-config intltool gnome-doc-utils itstool gobject-introspection" -makedepends="gtk+3-devel>=3.8 hicolor-icon-theme desktop-file-utils" +makedepends="gtk+3-devel hicolor-icon-theme desktop-file-utils" short_desc="GNOME Unicode Charmap" maintainer="Juan RP " homepage="http://www.gnome.org" license="GPL-2" -distfiles="${GNOME_SITE}/$pkgname/3.8/$pkgname-$version.tar.xz" -checksum=08272386155bc1a7d6a2d1a0ee8d2e5ea08a9512c40dbd76b3b4c3f105604901 +distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" +checksum=7a9425f07f8e4053e0382e627d65ca428674f8c63f2c721877ae8c62c25ccb00 long_desc=" gucharmap is a Unicode/ISO10646 character map and font viewer for the GNOME platform. It supports anti-aliased, scalable fonts and more." @@ -24,6 +24,7 @@ gucharmap-devel_package() { vmove usr/include vmove usr/lib/pkgconfig vmove usr/share/gir-1.0 + vmove "usr/lib/*.so" } } From 2d1b5170c222b289cffd4335b9c146177dd82db1 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Thu, 26 Sep 2013 16:25:19 +0200 Subject: [PATCH 031/159] gssdp: update to 0.14.5. --- srcpkgs/gssdp/template | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/srcpkgs/gssdp/template b/srcpkgs/gssdp/template index facbe6e2f00..ef35331f75e 100644 --- a/srcpkgs/gssdp/template +++ b/srcpkgs/gssdp/template @@ -1,17 +1,17 @@ # Template file for 'gssdp' pkgname=gssdp -version=0.14.4 +version=0.14.5 revision=1 build_style=gnu-configure configure_args="--disable-static" hostmakedepends="pkg-config intltool gobject-introspection" -makedepends="gtk+-devel libsoup-devel vala-devel>=0.20" +makedepends="gtk+-devel libsoup-devel vala-devel>=0.22" short_desc="GObject-based library for SSDP" maintainer="Juan RP " license="LGPL-2.1" homepage="http://gupnp.org" -distfiles="${GNOME_SITE}/gssdp/0.14/gssdp-$version.tar.xz" -checksum=ed93fa1555a7032fa1e2b24eeef17d20a2275ee8b1682f28ac48640d6f2112ac +distfiles="${GNOME_SITE}/gssdp/${version%.*}/gssdp-$version.tar.xz" +checksum=e847940a852c968d18c7ca044783e9b938c84c3b5f53978a29b636bf95c91af1 long_desc=" A GObject-based API for doing SSDP (Simple Service Discovery Protocol) transparently." @@ -31,6 +31,6 @@ gssdp-devel_package() { gssdp_package() { pkg_install() { - vmove usr + vmove all } } From 7c6c4f5a652e7b1d06a8eaadaae3c5746354e323 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Thu, 26 Sep 2013 16:28:53 +0200 Subject: [PATCH 032/159] gnome-desktop: update to 3.10.0 (soname bump). --- common/shlibs | 2 +- srcpkgs/gnome-desktop/template | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/common/shlibs b/common/shlibs index fbd4018569e..286ceb2039b 100644 --- a/common/shlibs +++ b/common/shlibs @@ -1092,7 +1092,7 @@ libgstsignalprocessor-1.0.so.0 gst-plugins-bad1-1.0.0_1 libgstbasevideo-1.0.so.0 gst-plugins-bad1-1.0.0_1 libgstbasecamerabinsrc-1.0.so.0 gst-plugins-bad1-1.0.0_1 libgstcodecparsers-1.0.so.0 gst-plugins-bad1-1.0.0_1 -libgnome-desktop-3.so.7 gnome-desktop-3.8.0_1 +libgnome-desktop-3.so.8 gnome-desktop-3.10.0_1 libsecret-1.so.0 libsecret-0.10_1 libgweather-3.so.6 libgweather-3.10.0_1 libgnomekbd.so.8 libgnomekbd-3.6.0_1 diff --git a/srcpkgs/gnome-desktop/template b/srcpkgs/gnome-desktop/template index 3dd136aaaab..ebe8ab764e9 100644 --- a/srcpkgs/gnome-desktop/template +++ b/srcpkgs/gnome-desktop/template @@ -1,22 +1,22 @@ # Template file for 'gnome-desktop' pkgname=gnome-desktop -version=3.8.4 +version=3.10.0 revision=1 build_style=gnu-configure configure_args="--with-gnome-distributor=voidlinux" hostmakedepends="which pkg-config intltool itstool gnome-doc-utils gobject-introspection" -makedepends="libxkbfile-devel gtk+3-devel gsettings-desktop-schemas-devel>=3.8 +makedepends="libxkbfile-devel gtk+3-devel gsettings-desktop-schemas-devel>=3.10 xkeyboard-config iso-codes" short_desc="GNOME desktop management utilities" maintainer="Juan RP " license="GPL-2, LGPL-2.1" homepage="http://www.gnome.org" -distfiles="${GNOME_SITE}/$pkgname/3.8/$pkgname-$version.tar.xz" -checksum=2aa1d4c5b78b018368e1cf9cd3568555dd6b04ad68536b9f338b28ac0f89df9f +distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" +checksum=3e87352ba30e9965199fb360c852e22ccb7c7e5c02965b6d63fb175f3737b75c gnome-desktop-devel_package() { - depends="libxkbfile-devel gsettings-desktop-schemas-devel>=3.8.0 - gtk+3-devel>=3.8 ${sourcepkg}-${version}_${revision}" + depends="libxkbfile-devel gsettings-desktop-schemas-devel>=3.10 + gtk+3-devel ${sourcepkg}-${version}_${revision}" short_desc+=" - development files" pkg_install() { vmove usr/include @@ -28,7 +28,7 @@ gnome-desktop-devel_package() { } gnome-desktop_package() { - depends="gsettings-desktop-schemas>=3.8.0 xkeyboard-config iso-codes" + depends="gsettings-desktop-schemas>=3.10 xkeyboard-config iso-codes" pkg_install() { vmove all } From f31f70c21a2ff708ec89ab0ee1010f98779d29da Mon Sep 17 00:00:00 2001 From: Juan RP Date: Thu, 26 Sep 2013 16:31:44 +0200 Subject: [PATCH 033/159] epiphany: update to 3.10.0. --- srcpkgs/epiphany/template | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/srcpkgs/epiphany/template b/srcpkgs/epiphany/template index 487ecc0a0a8..e69e21a95bd 100644 --- a/srcpkgs/epiphany/template +++ b/srcpkgs/epiphany/template @@ -1,20 +1,20 @@ # Template file for 'epiphany' pkgname=epiphany -version=3.8.2 +version=3.10.0 revision=1 build_style=gnu-configure configure_args="--disable-schemas-compile --disable-tests" -hostmakedepends="which pkg-config intltool gnome-doc-utils gobject-introspection" -makedepends="nss-devel libsoup-gnome-devel>=2.40 libnotify-devel - webkitgtk-devel sqlite-devel libxslt-devel avahi-glib-libs-devel - startup-notification-devel NetworkManager-devel gcr-devel>=3.8.0 - gnome-desktop-devel>=3.8.0 libsecret-devel libwnck-devel iso-codes" +hostmakedepends="which pkg-config intltool itstool gnome-doc-utils gobject-introspection" +makedepends="nss-devel libsoup-gnome-devel>=2.44 libnotify-devel + webkitgtk-devel>=2.1 sqlite-devel libxslt-devel avahi-glib-libs-devel + startup-notification-devel NetworkManager-devel gcr-devel>=3.10 + gnome-desktop-devel>=3.10 libsecret-devel libwnck-devel iso-codes" short_desc="Intuitive GNOME web browser" maintainer="Juan RP " homepage="http://www.gnome.org/projects/epiphany/" license="GPL-2" -distfiles="${GNOME_SITE}/$pkgname/3.8/$pkgname-$version.tar.xz" -checksum=ae89d6902ed243304d2cbf2fa361f6dd0cb3401fdaf726e6fdd4acc09197d50a +distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" +checksum=7bd2c3b21464a83909d75befe2f9501c1ab2f00e2371f26023f79818faec351e long_desc=" Epiphany is a simple yet powerful GNOME web browser targeted at non-technical users. Its principles are simplicity and standards compliance. Simplicity is @@ -26,8 +26,8 @@ long_desc=" integration with the GNOME desktop." epiphany_package() { - depends="gsettings-desktop-schemas>=3.8.0 ca-certificates - hicolor-icon-theme desktop-file-utils iso-codes" + depends="webkitgtk>=2.1 libsoup>=2.44 gsettings-desktop-schemas>=3.10 gcr>=3.10 + ca-certificates hicolor-icon-theme desktop-file-utils iso-codes" pkg_install() { vmove all } From 613788cca91588c4398b88940c2737eff827d5c2 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Thu, 26 Sep 2013 16:39:26 +0200 Subject: [PATCH 034/159] cheese: update to 3.10.0. --- srcpkgs/cheese/template | 30 ++++++++++++++++++------------ 1 file changed, 18 insertions(+), 12 deletions(-) diff --git a/srcpkgs/cheese/template b/srcpkgs/cheese/template index c133aedf03f..8f4a1d0ad2a 100644 --- a/srcpkgs/cheese/template +++ b/srcpkgs/cheese/template @@ -1,21 +1,21 @@ # Template file for 'cheese' pkgname=cheese -version=3.8.3 +version=3.10.0 revision=1 build_style=gnu-configure configure_args="--disable-static --disable-schemas-compile" hostmakedepends="which pkg-config intltool gnome-doc-utils itstool gobject-introspection" -makedepends="gst-plugins-base1-devel clutter-gtk-devel>=1.4.4 - clutter-gst-devel>=2.0.2_2 libgee08-devel>=0.10 libcanberra-devel - librsvg-devel libgudev-devel gnome-desktop-devel>=3.8.0 gst-plugins-bad1-devel - gst-plugins-good1 gnome-video-effects" +makedepends="gst-plugins-bad1-devel>=1:1.2.0 clutter-gtk-devel>=1.4.4_2 + clutter-gst-devel>=2.0.8_2 libgee08-devel>=0.12 libcanberra-devel + librsvg-devel libgudev-devel gnome-desktop-devel>=3.10 + gst-plugins-good1>=1:1.2.0 gnome-video-effects" short_desc="GNOME tool to take pictures and videos from your webcam" maintainer="Juan RP " homepage="http://www.gnome.org/projects/cheese/" license="GPL-2" -distfiles="${GNOME_SITE}/$pkgname/3.8/$pkgname-$version.tar.xz" -checksum=5f08079b6ccaa6ea8de9163ff0e43554347c12e13f0a60eb6ad06d291c116937 +distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" +checksum=eb0d8ba5211a4fe804d540e16a7fb61f16c467e23b106370723c32731b6e620b long_desc=" A webcam application that supports image and video capture. Makes it easy to take photos and videos of you, your friends, pets or whatever you want. Allows @@ -24,7 +24,6 @@ long_desc=" libcheese_package() { short_desc+=" - shared libraries" - replaces="cheese<=3.2.2" # for the typelib file pkg_install() { vmove "usr/lib/*.so.*" vmove usr/lib/girepository-1.0 @@ -32,8 +31,11 @@ libcheese_package() { } cheese-devel_package() { - depends="gst-plugins-base1-devel libcanberra-devel clutter-gst-devel>=2.0.2 - clutter-gtk-devel>=1.4.4 libcheese-${version}_${revision}" + depends="gst-plugins-bad1-devel>=1:1.2.0 + libcanberra-devel + clutter-gst-devel>=2.0.2 + clutter-gtk-devel>=1.4.4 + libcheese-${version}_${revision}" short_desc+=" - development files" pkg_install() { vmove usr/include @@ -45,8 +47,12 @@ cheese-devel_package() { } cheese_package() { - depends="desktop-file-utils hicolor-icon-theme - gst-plugins-good1 gnome-video-effects" + depends="clutter-gst>=2.0.8_2 + clutter-gtk>=1.4.4_2 + gst-plugins-good1>=1:1.2 + desktop-file-utils + hicolor-icon-theme + gnome-video-effects" pkg_install() { vmove all } From 90dcfa01dfc564ea55e324afbc0822fa3da1eb51 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Thu, 26 Sep 2013 16:50:47 +0200 Subject: [PATCH 035/159] evolution-data-server: update to 3.10.0 (soname bumps). --- common/shlibs | 14 +++++++------- srcpkgs/evolution-data-server/template | 13 +++++++------ 2 files changed, 14 insertions(+), 13 deletions(-) diff --git a/common/shlibs b/common/shlibs index 286ceb2039b..fa27c8268b5 100644 --- a/common/shlibs +++ b/common/shlibs @@ -546,15 +546,15 @@ libebook-1.2.so.13 evolution-data-server-3.3.92_1 libecal-1.2.so.11 evolution-data-server-3.3.92_1 libedata-book-1.2.so.13 evolution-data-server-3.3.92_1 libedata-cal-1.2.so.15 evolution-data-server-3.3.92_1 -libedataserver-1.2.so.16 evolution-data-server-3.3.92_1 +libedataserver-1.2.so.18 evolution-data-server-3.10.0_1 libedataserverui-3.0.so.1 evolution-data-server-3.3.92_1 -libcamel-1.2.so.40 evolution-data-server-3.6.0_1 -libedataserver-1.2.so.17 evolution-data-server-3.6.0_1 -libebackend-1.2.so.5 evolution-data-server-3.6.0_1 +libcamel-1.2.so.45 evolution-data-server-3.10.0_1 +libedataserver-1.2.so.18 evolution-data-server-3.10.0_1 +libebackend-1.2.so.7 evolution-data-server-3.10.0_1 libebook-1.2.so.14 evolution-data-server-3.6.0_1 -libedata-book-1.2.so.15 evolution-data-server-3.6.0_1 -libecal-1.2.so.15 evolution-data-server-3.6.0_1 -libedata-cal-1.2.so.18 evolution-data-server-3.6.0_1 +libedata-book-1.2.so.20 evolution-data-server-3.10.0_1 +libecal-1.2.so.16 evolution-data-server-3.10.0_1 +libedata-cal-1.2.so.23 evolution-data-server-3.10.0_1 libedataserverui-3.0.so.4 evolution-data-server-3.6.0_1 libgdata.so.13 libgdata-0.10.0_1 libpcap.so.1 libpcap-1.1.1_1 diff --git a/srcpkgs/evolution-data-server/template b/srcpkgs/evolution-data-server/template index 5052b9521c1..e0db3d8e091 100644 --- a/srcpkgs/evolution-data-server/template +++ b/srcpkgs/evolution-data-server/template @@ -1,6 +1,6 @@ # Template file for 'evolution-data-server' pkgname=evolution-data-server -version=3.8.5 +version=3.10.0 revision=1 build_style=gnu-configure configure_args="--with-openldap --disable-uoa @@ -8,19 +8,19 @@ configure_args="--with-openldap --disable-uoa --with-nss-includes=/usr/include/nss --enable-vala-bindings" hostmakedepends="pkg-config intltool flex gperf gobject-introspection" makedepends="db-devel>=5.3 sqlite-devel mit-krb5-devel nss-devel libical-devel - libsecret-devel libsoup-gnome-devel>=2.40 gcr-devel>=3.8.0 libldap-devel - libgdata-devel vala-devel>=0.20 libgweather-devel>=3.8.0" + libsecret-devel libsoup-gnome-devel>=2.44 gcr-devel>=3.10 libldap-devel + libgdata-devel>=0.14 vala-devel>=0.22 libgweather-devel>=3.10" short_desc="Evolution data server" maintainer="Juan RP " license="GPL-2" homepage="http://www.gnome.org" -distfiles="${GNOME_SITE}/$pkgname/3.8/$pkgname-$version.tar.xz" -checksum=73c4ecfed65651cc72966b90081d7b72f9b42573585bc89797efea65ccfdbd2a +distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" +checksum=1c47a0e138e9a5ed630d6e3ab30761e74e5f26ed7bbc31debfe76c2bac058b27 evolution-data-server-devel_package() { depends="sqlite-devel mit-krb5-devel nss-devel libical-devel libldap-devel libgdata-devel libsecret-devel - gnome-online-accounts-devel>=3.8.0 + gnome-online-accounts-devel>=3.10 ${sourcepkg}-${version}_${revision}" short_desc+=" - development files" pkg_install() { @@ -34,6 +34,7 @@ evolution-data-server-devel_package() { } evolution-data-server_package() { + depends="libgdata>=0.14 libsoup-gnome>=2.44 libgweather>=3.10" pkg_install() { vmove all } From f3e18892bfb41fbcb1ebbdd24874b05943115ab0 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Thu, 26 Sep 2013 17:05:46 +0200 Subject: [PATCH 036/159] evolution-data-server: require a newer libgdata in -devel pkg. --- srcpkgs/evolution-data-server/template | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/srcpkgs/evolution-data-server/template b/srcpkgs/evolution-data-server/template index e0db3d8e091..283a04538f3 100644 --- a/srcpkgs/evolution-data-server/template +++ b/srcpkgs/evolution-data-server/template @@ -1,7 +1,7 @@ # Template file for 'evolution-data-server' pkgname=evolution-data-server version=3.10.0 -revision=1 +revision=2 build_style=gnu-configure configure_args="--with-openldap --disable-uoa --with-krb5=/usr --with-nspr-includes=/usr/include/nspr @@ -19,8 +19,7 @@ checksum=1c47a0e138e9a5ed630d6e3ab30761e74e5f26ed7bbc31debfe76c2bac058b27 evolution-data-server-devel_package() { depends="sqlite-devel mit-krb5-devel nss-devel libical-devel - libldap-devel libgdata-devel libsecret-devel - gnome-online-accounts-devel>=3.10 + libldap-devel libgdata-devel>=0.14 libsecret-devel ${sourcepkg}-${version}_${revision}" short_desc+=" - development files" pkg_install() { From 9ca331d430176233202dd24eaa56ce7cae7dbbf4 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Thu, 26 Sep 2013 17:19:54 +0200 Subject: [PATCH 037/159] telepathy-glib: update to 0.21.2. --- srcpkgs/telepathy-glib/template | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/srcpkgs/telepathy-glib/template b/srcpkgs/telepathy-glib/template index 929ff37168f..06e2ad1c153 100644 --- a/srcpkgs/telepathy-glib/template +++ b/srcpkgs/telepathy-glib/template @@ -1,17 +1,17 @@ # Template file for 'telepathy-glib' pkgname=telepathy-glib -version=0.20.4 +version=0.21.2 revision=1 build_style=gnu-configure configure_args="--enable-vala-bindings --disable-static" -makedepends="pkg-config intltool vala-devel libxslt gobject-introspection - dbus-glib-devel" +hostmakedepends="pkg-config intltool libxslt gobject-introspection" +makedepends="dbus-glib-devel vala-devel" short_desc="Library for GLib-based Telepathy components" maintainer="Juan RP " license="LGPL-2.1" homepage="http://telepathy.freedesktop.org" distfiles="$homepage/releases/$pkgname/$pkgname-$version.tar.gz" -checksum=c9a307c85d412c58bc68265c4c4128a8e3ffb283bc784143f1f086faaafcb16c +checksum=288f4ea477a2d7c2b5397f068534332900f2eb5c88a4c61978e725e5bb7e20fa long_desc=" Telepathy is a D-Bus framework for unifying real time communication, including instant messaging, voice calls and video calls. It abstracts @@ -33,6 +33,6 @@ telepathy-glib-devel_package() { telepathy-glib_package() { pkg_install() { - vmove usr + vmove all } } From 5b626a12d738908217664d6097b17a8925039a57 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Thu, 26 Sep 2013 17:22:56 +0200 Subject: [PATCH 038/159] telepathy-gabble: update to 0.18.1. --- srcpkgs/telepathy-gabble/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/telepathy-gabble/template b/srcpkgs/telepathy-gabble/template index e505bea07b6..d4be66afca6 100644 --- a/srcpkgs/telepathy-gabble/template +++ b/srcpkgs/telepathy-gabble/template @@ -1,20 +1,20 @@ # Template file for 'telepathy-gabble' pkgname=telepathy-gabble -version=0.17.5 +version=0.18.1 revision=1 build_style=gnu-configure configure_args="--with-ca-certificates=/etc/ssl/certs/ca-certificates.crt --enable-handle-leak-debug --disable-debug --disable-static" hostmakedepends="python pkg-config libxslt" makedepends="glib-devel dbus-glib-devel libxml2-devel - sqlite-devel gnutls-devel>=3.1.5 telepathy-glib-devel libsoup-devel + sqlite-devel gnutls-devel>=3.1.5 telepathy-glib-devel>=0.21 libsoup-devel libnice-devel ca-certificates" short_desc="A Jabber/XMPP connection manager for Telepathy" maintainer="Juan RP " license="LGPL-2.1" homepage="http://telepathy.freedesktop.org" distfiles="$homepage/releases/$pkgname/$pkgname-$version.tar.gz" -checksum=df9e2d10d193f3b3c8daef62beb06c31e5bbf6d18b305a12ed292166979aea4e +checksum=6bba4ed2700ac194c23f4591a3d5d3fb4473206d9d1b8ce2bd96008460f76900 long_desc=" Telepathy is a D-Bus framework for unifying real time communication, including instant messaging, voice calls and video calls. It abstracts @@ -22,7 +22,7 @@ long_desc=" applications." telepathy-gabble_package() { - depends="ca-certificates" + depends="telepathy-glib>=0.21 ca-certificates" pkg_install() { vmove all } From 023a8b6f45a6bcd23ad35e326ebd50d65b0aaff9 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Thu, 26 Sep 2013 17:24:09 +0200 Subject: [PATCH 039/159] telepathy-idle: update to 0.1.17. --- srcpkgs/telepathy-idle/template | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/srcpkgs/telepathy-idle/template b/srcpkgs/telepathy-idle/template index 735136bd7bb..c976f1d5e13 100644 --- a/srcpkgs/telepathy-idle/template +++ b/srcpkgs/telepathy-idle/template @@ -1,16 +1,16 @@ # Template file for 'telepathy-idle' pkgname=telepathy-idle -version=0.1.13 +version=0.1.17 revision=1 build_style=gnu-configure -makedepends="pkg-config python libxslt openssl-devel dbus-glib-devel - telepathy-glib-devel" +hostmakedepends="pkg-config python libxslt" +makedepends="openssl-devel dbus-glib-devel telepathy-glib-devel>=0.21" short_desc="An IRC connection manager for Telepathy" maintainer="Juan RP " license="LGPL-2.1" homepage="http://telepathy.freedesktop.org" distfiles="${homepage}/releases/$pkgname/$pkgname-$version.tar.gz" -checksum=511ddac8099f59623d12a3e243afe435fbcb686665f00a5a4f370fc99be0e640 +checksum=e11e0d9fc6f29182c76d0c910760a1e1e24cd20a8c3ef652aca4dd2391006c73 long_desc=" Telepathy is a D-Bus framework for unifying real time communication, including instant messaging, voice calls and video calls. It abstracts @@ -18,7 +18,8 @@ long_desc=" applications." telepathy-idle_package() { + depends="telepathy-glib>=0.21" pkg_install() { - vmove usr + vmove all } } From 9fe693011021c48a9359950ca42b2f0831b66f9d Mon Sep 17 00:00:00 2001 From: Juan RP Date: Thu, 26 Sep 2013 17:29:55 +0200 Subject: [PATCH 040/159] telepathy-mission-control: update to 5.15.1. --- srcpkgs/telepathy-mission-control/template | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/srcpkgs/telepathy-mission-control/template b/srcpkgs/telepathy-mission-control/template index bc70eba8884..e647bd61e92 100644 --- a/srcpkgs/telepathy-mission-control/template +++ b/srcpkgs/telepathy-mission-control/template @@ -1,36 +1,38 @@ # Template file for 'telepathy-mission-control' pkgname=telepathy-mission-control -version=5.14.0 +version=5.15.1 revision=1 build_style=gnu-configure configure_args="--disable-static --enable-gnome-keyring --disable-schemas-compile" -hostmakedepends="pkg-config python-devel intltool libxslt" -makedepends="telepathy-glib-devel>=0.20.1 NetworkManager-devel - upower-devel libgnome-keyring-devel" +hostmakedepends="pkg-config python-devel intltool libxslt glib-devel" +makedepends="libglib-devel telepathy-glib-devel>=0.21 NetworkManager-devel + upower-devel libgnome-keyring-devel>=3.10" short_desc="Telepathy component providing abstraction for details of connection managers" maintainer="Juan RP " license="LGPL-2.1" homepage="http://telepathy.freedesktop.org" distfiles="$homepage/releases/$pkgname/$pkgname-$version.tar.gz" -checksum=58e0047f5292836c2c35e1603a908b3ac20a5c0b183869514c63de339fd48a30 +checksum=6fa7f9a4b122b7d498f885b1f0fb890cffcbb8d9a07322cabc9556fcdf0bb0c1 long_desc=" Telepathy is a D-Bus framework for unifying real time communication, including instant messaging, voice calls and video calls. It abstracts differences between protocols to provide a unified interface for applications." telepathy-mission-control-devel_package() { - depends="telepathy-glib-devel>=0.20.1 ${sourcepkg}>=${version}" - short_desc="${short_desc} - development files" + depends="telepathy-glib-devel>=0.21 ${sourcepkg}>=${version}" + short_desc+=" - development files" pkg_install() { vmove usr/include vmove usr/lib/pkgconfig vmove usr/share/gtk-doc + vmove "usr/lib/*.so" } } telepathy-mission-control_package() { + depends="telepathy-glib>=0.21" pkg_install() { - vmove usr + vmove all } } From c6c5e6eb1ad9dd202b9453775580aec2505707f8 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Thu, 26 Sep 2013 17:50:39 +0200 Subject: [PATCH 041/159] eog: update to 3.10.0. --- srcpkgs/eog/template | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/srcpkgs/eog/template b/srcpkgs/eog/template index 4d389de9080..c3bcb1837a4 100644 --- a/srcpkgs/eog/template +++ b/srcpkgs/eog/template @@ -1,17 +1,17 @@ # Template file for 'eog' pkgname=eog -version=3.8.2 +version=3.10.0 revision=1 build_style=gnu-configure hostmakedepends="which pkg-config intltool gnome-doc-utils itstool gobject-introspection" -makedepends="gnome-desktop-devel>=3.8.0 libpeas-devel lcms2-devel exempi-devel - libexif-devel librsvg-devel gnome-icon-theme shared-mime-info" +makedepends="gnome-desktop-devel>=3.10 libpeas-devel>=1.9 lcms2-devel exempi-devel + libexif-devel librsvg-devel>=2.39 gnome-icon-theme shared-mime-info" short_desc="Eye of GNOME graphics viewer program" maintainer="Juan RP " homepage="http://www.gnome.org" license="GPL-2" -distfiles="${GNOME_SITE}/eog/3.8/eog-$version.tar.xz" -checksum=689251b6dd18ef191cbfd9431c0324c70707b60edd73d86fc014bd8ae0bd8336 +distfiles="${GNOME_SITE}/eog/${version%.*}/eog-$version.tar.xz" +checksum=d449abfba8ac460b9d9af17778a0f2ffed5c983e74232596b807c3a99f11a1da long_desc=" eog or the Eye of GNOME is a simple graphics viewer for the GNOME desktop which uses the gdk-pixbuf library. It can deal with large images, and zoom From 1c268bfa6ee828aa119577011ebac5e6f35bd8e1 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Thu, 26 Sep 2013 17:53:42 +0200 Subject: [PATCH 042/159] nautilus: update to 3.10.0. --- srcpkgs/nautilus/template | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/srcpkgs/nautilus/template b/srcpkgs/nautilus/template index a265c5fc391..de0f6acdd31 100644 --- a/srcpkgs/nautilus/template +++ b/srcpkgs/nautilus/template @@ -1,19 +1,19 @@ # Template file for 'nautilus' pkgname=nautilus -version=3.8.2 +version=3.10.0 revision=1 build_style=gnu-configure configure_args="--disable-update-mimedb --disable-debug --disable-schemas-compile --disable-nst-extension" hostmakedepends="pkg-config intltool gobject-introspection" -makedepends="gtk+3-devel>=3.8 libnotify-devel libexif-devel exempi-devel - libxml2-devel tracker-devel>=0.16 gnome-desktop-devel>=3.8" +makedepends="gtk+3-devel libnotify-devel libexif-devel exempi-devel + libxml2-devel tracker-devel>=0.16 gnome-desktop-devel>=3.10" short_desc="The GNOME file manager" maintainer="Juan RP " homepage="http://www.gnome.org" license="GPL-2, LGPL-2.1" -distfiles="${GNOME_SITE}/$pkgname/3.8/$pkgname-$version.tar.xz" -checksum=dbddfdaac52d077d46d48a2f8dbecf6d13788d8f6b5fc9aa70826a24681d8a75 +distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" +checksum=9b15ccf1c9313631c8cf2ed337e697cd2b32630d2ae36072aa389d64af16d88c long_desc=" Nautilus is the official file manager for the GNOME desktop. It is designed to be primarly a file manager, but there is support for web and @@ -40,7 +40,7 @@ nautilus-devel_package() { } nautilus_package() { - depends="hicolor-icon-theme desktop-file-utils gsettings-desktop-schemas>=3.6.0" + depends="hicolor-icon-theme desktop-file-utils gsettings-desktop-schemas>=3.10" pkg_install() { vmove all } From baad66fa4c0f8586849d9f731990d53c3709e783 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Thu, 26 Sep 2013 17:56:18 +0200 Subject: [PATCH 043/159] evince: update to 3.10.0. --- srcpkgs/evince/template | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/srcpkgs/evince/template b/srcpkgs/evince/template index 043b32b724a..b53d5e7ad00 100644 --- a/srcpkgs/evince/template +++ b/srcpkgs/evince/template @@ -1,13 +1,13 @@ # Template file for 'evince' pkgname=evince -version=3.8.3 +version=3.10.0 revision=1 short_desc="GNOME Document viewer for multiple document formats" maintainer="Juan RP " homepage="http://projects.gnome.org/evince/" license="GPL-2" -distfiles="${GNOME_SITE}/$pkgname/3.8/$pkgname-$version.tar.xz" -checksum=1526921201fabe833733e7c2552dfbe62085fd18d325a27c2fffb332e5e418bd +distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" +checksum=495e855af3f071277d79be97a36bf39938d13d09530e80412fed4b7c0b1bdd3e build_style=gnu-configure configure_args="--enable-introspection --disable-schemas-compile @@ -18,10 +18,10 @@ hostmakedepends="which pkg-config intltool itstool gnome-doc-utils gobject-introspection" # XXX missing packages for DVI backend. -makedepends="tiff-devel libarchive-devel nautilus-devel>=3.8.0 +makedepends="tiff-devel libarchive-devel nautilus-devel>=3.10 poppler-glib-devel libxml2-devel djvulibre-devel libgxps-devel libSM-devel libICE-devel libspectre-devel libsecret-devel - gsettings-desktop-schemas-devel>=3.8.0 gnome-icon-theme" + gsettings-desktop-schemas-devel>=3.10 gnome-icon-theme" libevince_package() { short_desc+=" - runtime libraries" From 5cb14837231f06ceb52e5a6e8a02639b4b94b8cc Mon Sep 17 00:00:00 2001 From: Juan RP Date: Thu, 26 Sep 2013 17:59:16 +0200 Subject: [PATCH 044/159] gnome-session: update to 3.10.0. --- srcpkgs/gnome-session/template | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/srcpkgs/gnome-session/template b/srcpkgs/gnome-session/template index 4988fabe87b..38936c33884 100644 --- a/srcpkgs/gnome-session/template +++ b/srcpkgs/gnome-session/template @@ -1,23 +1,23 @@ # Template file for 'gnome-session' pkgname=gnome-session -version=3.8.4 +version=3.10.0 revision=1 build_style=gnu-configure configure_args="--disable-schemas-compile --enable-systemd" hostmakedepends="pkg-config intltool libxslt docbook-xsl" -makedepends="upower-devel json-glib-devel gtk+3-devel>=3.8 +makedepends="upower-devel json-glib-devel gtk+3-devel startup-notification-devel libXtst-devel systemd-devel - gsettings-desktop-schemas-devel>=3.8.0 dbus-glib-devel - gnome-desktop-devel>=3.8 libSM-devel" + gsettings-desktop-schemas-devel>=3.10 dbus-glib-devel + gnome-desktop-devel>=3.10 libSM-devel" short_desc="GNOME session management utilities" maintainer="Juan RP " homepage="http://www.gnome.org" license="GPL-2, LGPL-2.1" -distfiles="${GNOME_SITE}/$pkgname/3.8/$pkgname-$version.tar.xz" -checksum=e6ccc71563d9e36d166ebb8a1e9fc962ff31605d5800af411d3b8df494f03ec1 +distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" +checksum=38d90c5d5a33ec8a3002f1e77e201c1554eeb8bbba8923d94fab81b3a8e0696e gnome-session_package() { - depends="gsettings-desktop-schemas>=3.8.0 dconf alsa-plugins + depends="gsettings-desktop-schemas>=3.10 dconf>=0.18 alsa-plugins hicolor-icon-theme desktop-file-utils" pkg_install() { vmove all From 1a0b3bf0ac71c07f92cf9a021514ef9002d0c0a7 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Thu, 26 Sep 2013 18:06:22 +0200 Subject: [PATCH 045/159] json-glib: update to 0.16.2. --- srcpkgs/json-glib/template | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/srcpkgs/json-glib/template b/srcpkgs/json-glib/template index fb9930b60c9..3f0df01eb5d 100644 --- a/srcpkgs/json-glib/template +++ b/srcpkgs/json-glib/template @@ -1,8 +1,7 @@ # Template build file for 'json-glib'. pkgname=json-glib -version=0.16.0 +version=0.16.2 revision=1 -configure_args="--enable-static --with-pic=yes" build_style=gnu-configure hostmakedepends="pkg-config gobject-introspection" makedepends="libglib-devel" @@ -10,8 +9,8 @@ short_desc="A JSON parser for GLib-based libraries and applications" maintainer="Juan RP " homepage="http://live.gnome.org/JsonGlib" license="LGPL-2" -distfiles="${GNOME_SITE}/${pkgname}/0.16/${pkgname}-${version}.tar.xz" -checksum=e4a3fd2f399e4c148aad608e6ed0a94095f2ddde9dd12f5aa2f072ecae5c1d37 +distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" +checksum=a95475364ec27ab1d2a69303cf579018558bfb6981e3498b3aaf1e6401f7422c long_desc=" JSON-GLib implements a full JSON parser using GLib and GObject. @@ -22,17 +21,17 @@ long_desc=" json-glib-devel_package() { depends="libglib-devel json-glib>=${version}" - short_desc="${short_desc} - development files" + short_desc+=" - development files" pkg_install() { - vmove "usr/lib/*.a" vmove usr/include vmove usr/share vmove usr/lib/pkgconfig + vmove "usr/lib/*.so" } } json-glib_package() { pkg_install() { - vmove usr + vmove all } } From 6125f9460c17c2e62552136e4a17d74e23cd8bc2 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Thu, 26 Sep 2013 18:10:44 +0200 Subject: [PATCH 046/159] New package: geocode-glib-3.10.0. --- common/shlibs | 1 + srcpkgs/geocode-glib-devel | 1 + srcpkgs/geocode-glib/template | 39 +++++++++++++++++++++++++++++++++++ 3 files changed, 41 insertions(+) create mode 120000 srcpkgs/geocode-glib-devel create mode 100644 srcpkgs/geocode-glib/template diff --git a/common/shlibs b/common/shlibs index fa27c8268b5..d70bfcdfd26 100644 --- a/common/shlibs +++ b/common/shlibs @@ -1414,3 +1414,4 @@ libthreadutil.so.6 libupnp-1.6.18_1 libixml.so.2 libupnp-1.6.18_1 libupnp.so.6 libupnp-1.6.18_1 libmozjs-17.0.so mozjs17-17.0.0_1 +libgeocode-glib.so.0 geocode-glib-3.10.0_1 diff --git a/srcpkgs/geocode-glib-devel b/srcpkgs/geocode-glib-devel new file mode 120000 index 00000000000..45ec1fe82f8 --- /dev/null +++ b/srcpkgs/geocode-glib-devel @@ -0,0 +1 @@ +geocode-glib \ No newline at end of file diff --git a/srcpkgs/geocode-glib/template b/srcpkgs/geocode-glib/template new file mode 100644 index 00000000000..2c7145299f5 --- /dev/null +++ b/srcpkgs/geocode-glib/template @@ -0,0 +1,39 @@ +# Template file for 'geocode-glib' +pkgname=geocode-glib +version=3.10.0 +revision=1 +build_style=gnu-configure +configure_args="--disable-static" +hostmakedepends="pkg-config intltool gobject-introspection" +makedepends="json-glib-devel>=0.16.2 libsoup-gnome-devel>=2.44" +short_desc="GLib library for geocoding and reverse geocoding" +homepage="http://www.gnome.org" +license="LGPL-2.1" +maintainer="Juan RP " +distfiles="${GNOME_SITE}/$pkgname/${version%.*}/${pkgname}-${version}.tar.xz" +checksum=0aedc198cf8a9b934a290d50aadaf4b48bb13c3b4783618c6753eb466cdaa637 +long_desc=" + geocode-glib is a convenience library for the geocoding (finding longitude, + and latitude from an address) and reverse geocoding (finding an address from + coordinates). It uses Nominatim service to achieve that. It also caches + (reverse-)geocoding requests for faster results and to avoid unnecessary server + load." + +geocode-glib-devel_package() { + depends="libglib-devel ${sourcepkg}>=${version}" + short_desc+=" - development files" + pkg_install() { + vmove usr/include + vmove usr/lib/pkgconfig + vmove "usr/lib/*.so" + vmove usr/share/gtk-doc + vmove usr/share/gir-1.0 + } +} + +geocode-glib_package() { + depends="json-glib>=0.16.2 libsoup-gnome>=2.44" + pkg_install() { + vmove all + } +} From 27e932ab9774fb263b422993080bbf7fee173c03 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Thu, 26 Sep 2013 18:14:40 +0200 Subject: [PATCH 047/159] libgweather: bump libsoup requirement to 2.44. --- srcpkgs/libgweather/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/libgweather/template b/srcpkgs/libgweather/template index 17f7f29577f..7492ba2dcdb 100644 --- a/srcpkgs/libgweather/template +++ b/srcpkgs/libgweather/template @@ -1,12 +1,12 @@ # Template file for 'libgweather' pkgname=libgweather version=3.10.0 -revision=1 +revision=2 build_style=gnu-configure configure_args="--disable-schemas-compile --enable-locations-compression --with-zoneinfo-dir=/usr/share/zoneinfo" hostmakedepends="pkg-config intltool gobject-introspection" -makedepends="libxml2-devel libsoup-gnome-devel gtk+3-devel>=3.10 vala-devel gnome-icon-theme" +makedepends="libxml2-devel libsoup-gnome-devel>=2.44 gtk+3-devel>=3.10 vala-devel gnome-icon-theme" short_desc="GNOME Weather information access library" maintainer="Juan RP " license="LGPL-2.1" @@ -19,7 +19,7 @@ long_desc=" libgweather-devel_package() { depends="gdk-pixbuf-devel gtk+3-devel libxml2-devel - libsoup-devel ${sourcepkg}-${version}_${revision}" + libsoup-devel>=2.44 ${sourcepkg}-${version}_${revision}" short_desc+=" - development files" pkg_install() { vmove usr/include @@ -32,7 +32,7 @@ libgweather-devel_package() { } libgweather_package() { - depends="gnome-icon-theme" + depends="libsoup-gnome>=2.44 gnome-icon-theme" pkg_install() { vmove all } From 84b3dcc902163a04d3adb9d27580587184f36cda Mon Sep 17 00:00:00 2001 From: Juan RP Date: Thu, 26 Sep 2013 18:23:38 +0200 Subject: [PATCH 048/159] New package: geoclue2-2.0.0. --- srcpkgs/geoclue2/template | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 srcpkgs/geoclue2/template diff --git a/srcpkgs/geoclue2/template b/srcpkgs/geoclue2/template new file mode 100644 index 00000000000..2ecf76d37dd --- /dev/null +++ b/srcpkgs/geoclue2/template @@ -0,0 +1,26 @@ +# Template file for 'geoclue2' +pkgname=geoclue2 +version=2.0.0 +revision=1 +wrksrc="geoclue-${version}" +build_style=gnu-configure +configure_args="--disable-static --disable-schemas-compile" +hostmakedepends="pkg-config intltool gobject-introspection" +makedepends="json-glib-devel libsoup-gnome-devel>=2.44" +short_desc="The Geoinformation Service (2.x series)" +homepage="http://www.freedesktop.org/wiki/Software/GeoClue" +license="LGPL-2.1" +maintainer="Juan RP " +distfiles="http://www.freedesktop.org/software/geoclue/releases/${version%.*}/geoclue-${version}.tar.xz" +checksum=4a82f184e55a163d86e0ad69bbe1bba9960bb5094220fe1f01350bceda8c67a1 +long_desc=" + Geoclue is a modular geoinformation service built on top of the D-Bus + messaging system. The goal of the Geoclue project is to make creating + location-aware applications as simple as possible." + +geoclue2_package() { + depends="libsoup>=2.44" + pkg_install() { + vmove all + } +} From da06d68ffa2b70c96b6f269c64ebdaab5ff21dd0 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Thu, 26 Sep 2013 18:26:04 +0200 Subject: [PATCH 049/159] gnome-settings-daemon: update to 3.10.0. --- srcpkgs/gnome-settings-daemon/template | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/srcpkgs/gnome-settings-daemon/template b/srcpkgs/gnome-settings-daemon/template index 89bf24ace9b..6d252aac93c 100644 --- a/srcpkgs/gnome-settings-daemon/template +++ b/srcpkgs/gnome-settings-daemon/template @@ -1,22 +1,23 @@ # Template file for 'gnome-settings-daemon' pkgname=gnome-settings-daemon -version=3.8.5 +version=3.10.0 revision=1 build_style=gnu-configure configure_args="--disable-static --enable-cups --disable-schemas-compile --enable-systemd --disable-packagekit" hostmakedepends="pkg-config intltool libxslt docbook-xsl gobject-introspection" -makedepends="colord-devel>=0.1.23_3 libxklavier-devel libnotify-devel - gtk+3-devel>=3.8 libcanberra-devel pulseaudio-devel nss-devel - startup-notification-devel gnome-desktop-devel>=3.8.0 libgnomekbd-devel +makedepends="geocode-glib-devel colord-devel>=0.1.23_3 libxklavier-devel + gtk+3-devel libcanberra-devel pulseaudio-devel nss-devel libnotify-devel + startup-notification-devel gnome-desktop-devel>=3.10 libgnomekbd-devel xf86-input-wacom-devel libwacom-devel>=0.7 systemd-devel librsvg-devel - ibus-devel>=1.4.99 cups-devel libgudev-devel upower-devel" + ibus-devel>=1.4.99 cups-devel libgudev-devel upower-devel polkit-devel + libgweather-devel>=3.10 geoclue2" short_desc="GNOME settings daemon" maintainer="Juan RP " homepage="http://www.gnome.org" license="GPL-3" -distfiles="${GNOME_SITE}/$pkgname/3.8/$pkgname-$version.tar.xz" -checksum=19420c97296802162fd4e0e0a08e797f5038ec8bd98cffe222362e24c7405784 +distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" +checksum=9b9fb21603b28f080de16a96986269f3a6b61bbbcc4dda0272159aa3e4d67005 gnome-settings-daemon-devel_package() { depends="libglib-devel" @@ -28,7 +29,7 @@ gnome-settings-daemon-devel_package() { } gnome-settings-daemon_package() { - depends="pulseaudio hicolor-icon-theme" + depends="geoclue2 pulseaudio hicolor-icon-theme" pkg_install() { vmove all } From 4e3e5c81e8ec48b680f7e3489cfe6014776ce36a Mon Sep 17 00:00:00 2001 From: Juan RP Date: Thu, 26 Sep 2013 18:30:06 +0200 Subject: [PATCH 050/159] gdm: update to 3.10.0. --- srcpkgs/gdm/template | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/srcpkgs/gdm/template b/srcpkgs/gdm/template index 26b88c508f4..caae9871c26 100644 --- a/srcpkgs/gdm/template +++ b/srcpkgs/gdm/template @@ -1,6 +1,6 @@ # Template file for 'gdm' pkgname=gdm -version=3.8.4 +version=3.10.0 revision=1 build_style=gnu-configure configure_args="--disable-schemas-compile --disable-static @@ -9,15 +9,15 @@ configure_args="--disable-schemas-compile --disable-static --with-xauth-dir=/run/gdm --with-pid-file=/run/gdm/gdm.pid --with-systemdsystemunitdir=/usr/lib/systemd/system --without-console-kit" hostmakedepends="pkg-config itstool intltool which gnome-doc-utils gobject-introspection" -makedepends="pam-devel nss-devel accountsservice-devel gtk+3-devel>=3.8 upower-devel +makedepends="pam-devel nss-devel accountsservice-devel gtk+3-devel>=3.10 upower-devel libcanberra-devel systemd-devel xrdb dconf>=0.16 hicolor-icon-theme - xorg-server gnome-session>=3.8.0 gnome-settings-daemon>=3.8" + xorg-server gnome-session>=3.10 gnome-settings-daemon>=3.10" short_desc="GNOME Display Manager" maintainer="Juan RP " homepage="http://www.gnome.org" license="GPL-2" -distfiles="${GNOME_SITE}/$pkgname/3.8/$pkgname-$version.tar.xz" -checksum=db40fb66bf476721b6d333abe0bfed7feacdca7d492f971c86a3f1e5cccdb447 +distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" +checksum=bb04600298f5be795f0d0bfea40bbd9bf78f95a44c5caeda4d0cc6a05207318c long_desc=" GDM is the GNOME Display Manager, it is the little proggie that runs in the background, runs your X sessions, presents you with a login box @@ -75,8 +75,8 @@ gdm_package() { system_accounts="gdm" gdm_homedir="/var/lib/gdm" systemd_services="gdm.service off" - depends="xrdb dconf>=0.16 hicolor-icon-theme - xorg-server gnome-session>=3.8 gnome-settings-daemon>=3.8" + depends="xrdb xorg-server hicolor-icon-theme + dconf>=0.18 gnome-session>=3.10 gnome-settings-daemon>=3.10" pkg_install() { vmove all } From 6176273c330af9ca02b9ae118dd435495d2b3df1 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Thu, 26 Sep 2013 18:31:24 +0200 Subject: [PATCH 051/159] gnome-backgrounds: update to 3.10.0. --- srcpkgs/gnome-backgrounds/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/gnome-backgrounds/template b/srcpkgs/gnome-backgrounds/template index 78208a2649a..776b98d4838 100644 --- a/srcpkgs/gnome-backgrounds/template +++ b/srcpkgs/gnome-backgrounds/template @@ -1,6 +1,6 @@ # Template file for 'gnome-backgrounds' pkgname=gnome-backgrounds -version=3.8.1 +version=3.10.0 revision=1 build_style=gnu-configure hostmakedepends="pkg-config intltool" @@ -8,12 +8,12 @@ short_desc="Set of background images for the GNOME Desktop" maintainer="Juan RP " homepage="http://www.gnome.org" license="GPL-2" -distfiles="${GNOME_SITE}/$pkgname/3.8/$pkgname-$version.tar.xz" -checksum=226cf0d116a0d78b96c0ed865473975f9ca0e1c02a0442c6be8f1dd3c4a715b8 +distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" +checksum=db59a287b213e54ee5ccb58aa64166e8d396094370f22c5ec43fd3e7d4add3f9 gnome-backgrounds_package() { noarch="yes" pkg_install() { - vmove usr + vmove all } } From 365989e6ec19a2247952a802bf2dd8102963731e Mon Sep 17 00:00:00 2001 From: Juan RP Date: Thu, 26 Sep 2013 18:34:36 +0200 Subject: [PATCH 052/159] gnome-bluetooth: update to 3.10.0 (soname bump). --- common/shlibs | 3 +-- srcpkgs/gnome-bluetooth/template | 17 +++++++---------- 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/common/shlibs b/common/shlibs index d70bfcdfd26..183ef331944 100644 --- a/common/shlibs +++ b/common/shlibs @@ -610,8 +610,7 @@ libatkmm-1.6.so.1 atkmm-2.22.1_1 libgtkmm-3.0.so.1 gtkmm-2.99.5_1 libgdkmm-3.0.so.1 gtkmm-2.99.5_1 libgksu2.so.0 libgksu-2.0.12_1 -libgnome-bluetooth.so.10 gnome-bluetooth-3.3.92_1 -libgnome-bluetooth-applet.so.0 gnome-bluetooth-3.3.92_1 +libgnome-bluetooth.so.12 gnome-bluetooth-3.10.0_1 libsasl2.so.2 libsasl-2.1.23_1 liblber-2.4.so.2 libldap-2.4.21_1 libldap-2.4.so.2 libldap-2.4.21_1 diff --git a/srcpkgs/gnome-bluetooth/template b/srcpkgs/gnome-bluetooth/template index 932b7388bfc..54b25924a61 100644 --- a/srcpkgs/gnome-bluetooth/template +++ b/srcpkgs/gnome-bluetooth/template @@ -1,6 +1,6 @@ # Template file for 'gnome-bluetooth' pkgname=gnome-bluetooth -version=3.8.0 +version=3.10.0 revision=1 build_style=gnu-configure configure_args="--disable-desktop-update --disable-schemas-compile @@ -11,8 +11,8 @@ short_desc="The GNOME Bluetooth Subsystem" maintainer="Juan RP " homepage="http://live.gnome.org/GnomeBluetooth" license="GPL, LGPL" -distfiles="${GNOME_SITE}/$pkgname/3.8/$pkgname-$version.tar.xz" -checksum=70f275922f10ac9f40eb7d57f89193502ee490894b5b721d0f6273432fc97f82 +distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" +checksum=7ee4ad464abfed59f04d1a471eb25cfb95fc34eeefbe4c47580dbb50df2ab712 long_desc=" This package contains tools for managing and manipulating Bluetooth devices using the GNOME desktop. @@ -23,24 +23,21 @@ long_desc=" bluetooth-sendto is also included for sending files to Bluetooth devices via OBEX." -post_install() { - vinstall ${FILESDIR}/61-gnome-bluetooth-rfkill.rules 644 usr/lib/udev/rules.d -} - gnome-bluetooth-devel_package() { depends="glib-devel gtk+3-devel ${sourcepkg}>=${version}" - short_desc="${short_desc} - development files" + short_desc+=" - development files" pkg_install() { vmove usr/include vmove usr/lib/pkgconfig vmove usr/share/gir-1.0 vmove usr/share/gtk-doc + vmove "usr/lib/*.so" } } gnome-bluetooth_package() { - depends="dconf gvfs hicolor-icon-theme desktop-file-utils" + depends="bluez>=5 dconf>=0.18 gvfs>=1.18 hicolor-icon-theme desktop-file-utils" pkg_install() { - vmove usr + vmove all } } From 1d1a8bcecddb8d143207af36da54c3dae389887e Mon Sep 17 00:00:00 2001 From: Juan RP Date: Thu, 26 Sep 2013 18:36:30 +0200 Subject: [PATCH 053/159] gnome-calulator: update to 3.10.0. --- srcpkgs/gnome-calculator/template | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/srcpkgs/gnome-calculator/template b/srcpkgs/gnome-calculator/template index 231427b2d89..ac6a37c30e7 100644 --- a/srcpkgs/gnome-calculator/template +++ b/srcpkgs/gnome-calculator/template @@ -1,20 +1,20 @@ # Template file for 'gnome-calculator' pkgname=gnome-calculator -version=3.8.2 +version=3.10.0 revision=1 build_style=gnu-configure hostmakedepends="which pkg-config intltool itstool gnome-doc-utils" -makedepends="libxml2-devel gtk+3-devel gsettings-desktop-schemas-devel>=3.6.0 +makedepends="libxml2-devel gtk+3-devel gsettings-desktop-schemas-devel>=3.10 hicolor-icon-theme desktop-file-utils" short_desc="The GNOME calculator" maintainer="Juan RP " homepage="http://www.gnome.org" license="GPL-2" -distfiles="${GNOME_SITE}/$pkgname/3.8/$pkgname-$version.tar.xz" -checksum=13d67b6dfa2501b883add8adf5470c5fea5eb1f1fa87f84e8ceda069418f1e81 +distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" +checksum=d76ad21286ea20308bb6302833ce8e5846df7e8ccd2b7ac0a48619f0d6cf2cb1 gnome-calculator_package() { - depends="hicolor-icon-theme desktop-file-utils" + depends="gsettings-desktop-schemas>=3.10 hicolor-icon-theme desktop-file-utils" replaces="gcalctool>=0" pkg_install() { vmove all From 5326a74e12a30855da2528f2ba0164ffd3820e63 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Thu, 26 Sep 2013 18:40:09 +0200 Subject: [PATCH 054/159] cheese: bump clutter-{gst,gtk} requirement. --- srcpkgs/cheese/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/cheese/template b/srcpkgs/cheese/template index 8f4a1d0ad2a..0a1c2f5d52f 100644 --- a/srcpkgs/cheese/template +++ b/srcpkgs/cheese/template @@ -1,7 +1,7 @@ # Template file for 'cheese' pkgname=cheese version=3.10.0 -revision=1 +revision=2 build_style=gnu-configure configure_args="--disable-static --disable-schemas-compile" hostmakedepends="which pkg-config intltool gnome-doc-utils itstool @@ -32,9 +32,9 @@ libcheese_package() { cheese-devel_package() { depends="gst-plugins-bad1-devel>=1:1.2.0 + clutter-gst-devel>=2.0.8_2 + clutter-gtk-devel>=1.4.4_2 libcanberra-devel - clutter-gst-devel>=2.0.2 - clutter-gtk-devel>=1.4.4 libcheese-${version}_${revision}" short_desc+=" - development files" pkg_install() { From 4b4ebc885986a8c128f3580225bc746c581eb356 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Thu, 26 Sep 2013 18:51:43 +0200 Subject: [PATCH 055/159] gnome-online-accounts: bump webkitgtk requirement. --- srcpkgs/gnome-online-accounts/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/gnome-online-accounts/template b/srcpkgs/gnome-online-accounts/template index b8153c7444c..80435affc0c 100644 --- a/srcpkgs/gnome-online-accounts/template +++ b/srcpkgs/gnome-online-accounts/template @@ -1,7 +1,7 @@ # Template file for 'gnome-online-accounts' pkgname=gnome-online-accounts version=3.10.0 -revision=1 +revision=2 build_style=gnu-configure configure_args="--enable-google --enable-kerberos --enable-flickr --enable-facebook --disable-static --enable-exchange --enable-imap-smtp @@ -18,7 +18,7 @@ distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" checksum=bba85366632cf5ce777b6889eab505d98d7593c37f7859a312dc57dde05a0feb gnome-online-accounts-devel_package() { - depends="gtk+3-devel ${sourcepkg}-${version}_${revision}" + depends="webkitgtk-devel>=2.1 ${sourcepkg}-${version}_${revision}" short_desc+=" - development files" pkg_install() { vmove usr/include From c85c99f13acd3106082735cd9dc70803a808318d Mon Sep 17 00:00:00 2001 From: Juan RP Date: Thu, 26 Sep 2013 18:59:18 +0200 Subject: [PATCH 056/159] rest: update to 0.7.90. --- srcpkgs/rest/template | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/srcpkgs/rest/template b/srcpkgs/rest/template index d3d3744823b..9c27b471fa2 100644 --- a/srcpkgs/rest/template +++ b/srcpkgs/rest/template @@ -1,17 +1,17 @@ # Template file for 'rest' pkgname=rest -version=0.7.12 -revision=4 +version=0.7.90 +revision=1 build_style=gnu-configure configure_args="--disable-static" hostmakedepends="pkg-config gobject-introspection" -makedepends="libglib-devel libsoup-gnome-devel libxml2-devel" +makedepends="libglib-devel libsoup-gnome-devel>=2.44 libxml2-devel" short_desc="RESTful library" maintainer="Juan RP " license="GPL-2" homepage="http://www.gnome.org" distfiles="${GNOME_SITE}/$pkgname/0.7/$pkgname-$version.tar.xz" -checksum=16ffa4929078dabfcfac31f9ce942072ebab67e3339ce9f378127457b03baf3a +checksum=1d682acaac4d946cc7c98a2dd9d65a8c83a6fdb8ca6759e70b8b5042fe66c022 long_desc=" This library has been designed to make it easier to access web services that claim to be RESTful. A reasonable definition of what this means can be found @@ -20,17 +20,19 @@ long_desc=" called on." rest-devel_package() { - depends="libglib-devel libsoup-devel libxml2-devel rest-${version}_${revision}" - short_desc="${short_desc} -- development files" + depends="libglib-devel libsoup-devel>=2.44 libxml2-devel rest-${version}_${revision}" + short_desc+=" - development files" pkg_install() { vmove usr/include vmove usr/lib/pkgconfig vmove usr/share + vmove "usr/lib/*.so" } } rest_package() { + depends="libsoup-gnome>=2.44" pkg_install() { - vmove usr + vmove all } } From a4e432f2fff16f8146d4b88aaec6380b9790838b Mon Sep 17 00:00:00 2001 From: Juan RP Date: Thu, 26 Sep 2013 19:06:03 +0200 Subject: [PATCH 057/159] gnome-online-accounts: set proper deps in -devel pkg. --- srcpkgs/gnome-online-accounts/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/gnome-online-accounts/template b/srcpkgs/gnome-online-accounts/template index 80435affc0c..999696b01af 100644 --- a/srcpkgs/gnome-online-accounts/template +++ b/srcpkgs/gnome-online-accounts/template @@ -1,7 +1,7 @@ # Template file for 'gnome-online-accounts' pkgname=gnome-online-accounts version=3.10.0 -revision=2 +revision=3 build_style=gnu-configure configure_args="--enable-google --enable-kerberos --enable-flickr --enable-facebook --disable-static --enable-exchange --enable-imap-smtp @@ -18,7 +18,7 @@ distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" checksum=bba85366632cf5ce777b6889eab505d98d7593c37f7859a312dc57dde05a0feb gnome-online-accounts-devel_package() { - depends="webkitgtk-devel>=2.1 ${sourcepkg}-${version}_${revision}" + depends="glib-devel gtk+3-devel ${sourcepkg}-${version}_${revision}" short_desc+=" - development files" pkg_install() { vmove usr/include From 8b378fe5d06266f65226924420428fb5fd0745b3 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Thu, 26 Sep 2013 19:09:11 +0200 Subject: [PATCH 058/159] gnome-online-accounts: bump dep requirements. --- srcpkgs/gnome-online-accounts/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/gnome-online-accounts/template b/srcpkgs/gnome-online-accounts/template index 999696b01af..261532ac601 100644 --- a/srcpkgs/gnome-online-accounts/template +++ b/srcpkgs/gnome-online-accounts/template @@ -1,7 +1,7 @@ # Template file for 'gnome-online-accounts' pkgname=gnome-online-accounts version=3.10.0 -revision=3 +revision=4 build_style=gnu-configure configure_args="--enable-google --enable-kerberos --enable-flickr --enable-facebook --disable-static --enable-exchange --enable-imap-smtp @@ -29,7 +29,7 @@ gnome-online-accounts-devel_package() { } gnome-online-accounts_package() { - depends="hicolor-icon-theme" + depends="libsoup-gnome>=2.44 rest>=7.1.90 gcr>=3.10 webkitgtk>=2.1 hicolor-icon-theme" pkg_install() { vmove all } From bcd2ac506d4ba67b9378418e88568a8cafecb6e0 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Thu, 26 Sep 2013 19:12:14 +0200 Subject: [PATCH 059/159] gnome-online-accounts: fix rest version requirement. --- srcpkgs/gnome-online-accounts/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/gnome-online-accounts/template b/srcpkgs/gnome-online-accounts/template index 261532ac601..4bf2ef2ea8a 100644 --- a/srcpkgs/gnome-online-accounts/template +++ b/srcpkgs/gnome-online-accounts/template @@ -1,14 +1,14 @@ # Template file for 'gnome-online-accounts' pkgname=gnome-online-accounts version=3.10.0 -revision=4 +revision=5 build_style=gnu-configure configure_args="--enable-google --enable-kerberos --enable-flickr --enable-facebook --disable-static --enable-exchange --enable-imap-smtp --enable-owncloud --enable-windows-live --enable-twitter --enable-yahoo" hostmakedepends="pkg-config intltool libxslt docbook-xsl gobject-introspection" makedepends="libsoup-gnome-devel>=2.44 webkitgtk-devel>=2.1 json-glib-devel - libnotify-devel rest-devel gcr-devel>=3.10 libsecret-devel mit-krb5-devel + libnotify-devel rest-devel>=0.7.90 gcr-devel>=3.10 libsecret-devel mit-krb5-devel dbus-glib-devel telepathy-glib-devel" short_desc="GNOME service to access online accounts" maintainer="Juan RP " @@ -29,7 +29,7 @@ gnome-online-accounts-devel_package() { } gnome-online-accounts_package() { - depends="libsoup-gnome>=2.44 rest>=7.1.90 gcr>=3.10 webkitgtk>=2.1 hicolor-icon-theme" + depends="libsoup-gnome>=2.44 rest>=0.7.90 gcr>=3.10 webkitgtk>=2.1 hicolor-icon-theme" pkg_install() { vmove all } From 4dc4a65927e8f2b56a9730677bdb69fe59fe8f32 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Thu, 26 Sep 2013 19:24:21 +0200 Subject: [PATCH 060/159] libsocialweb: update to 0.25.21. --- srcpkgs/libsocialweb/template | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/srcpkgs/libsocialweb/template b/srcpkgs/libsocialweb/template index 32a7ddba00a..27eb7cb412a 100644 --- a/srcpkgs/libsocialweb/template +++ b/srcpkgs/libsocialweb/template @@ -1,19 +1,19 @@ # Template file for 'libsocialweb' pkgname=libsocialweb -version=0.25.20 -revision=3 +version=0.25.21 +revision=1 build_style=gnu-configure configure_args="--enable-all-services=yes --with-online=always --enable-vala-bindings" hostmakedepends="pkg-config intltool libxslt docbook-xsl gobject-introspection" -makedepends="vala-devel rest-devel dbus-glib-devel libgnome-keyring-devel - GConf-devel json-glib-devel libsoup-gnome-devel" +makedepends="vala-devel rest-devel>=0.7.90 dbus-glib-devel libgnome-keyring-devel + GConf-devel json-glib-devel libsoup-gnome-devel>=2.44" short_desc="A personal social data server" homepage="http://gnome.org" license="LGPL-2.1" maintainer="Juan RP " distfiles="${GNOME_SITE}/$pkgname/0.25/$pkgname-$version.tar.xz" -checksum=eb0078f44eb5fc4570fcee26c5670a433ca1bb83be0cead421a4a03e7d838ff5 +checksum=f676567640cede66b6ff62f440c968943c2f3a164dd5f26155b6154ab93bf687 long_desc=" libfolks is a library that aggregates people from multiple sources (eg, Telepathy connection managers and eventually evolution data server, Facebook, @@ -22,7 +22,7 @@ long_desc=" basically automatic." libsocialweb-devel_package() { - depends="dbus-glib-devel rest-devel libsoup-gnome-devel libsocialweb>=${version}" + depends="dbus-glib-devel rest-devel>=0.7.90 libsoup-gnome-devel>=2.44 libsocialweb>=${version}" short_desc+=" -- development files" pkg_install() { vmove usr/include @@ -30,11 +30,13 @@ libsocialweb-devel_package() { vmove usr/share/gir-1.0 vmove usr/share/gtk-doc vmove usr/share/vala + vmove "usr/lib/*.so" } } libsocialweb_package() { + depends="rest>=0.7.90 libsoup-gnome>=2.44" pkg_install() { - vmove usr + vmove all } } From c2ae7326c4f93efe2d64a9809e23e3230d5ba13f Mon Sep 17 00:00:00 2001 From: Juan RP Date: Thu, 26 Sep 2013 19:28:00 +0200 Subject: [PATCH 061/159] gnome-control-center: update to 3.10.0. --- srcpkgs/gnome-control-center/template | 32 +++++++++++++++------------ 1 file changed, 18 insertions(+), 14 deletions(-) diff --git a/srcpkgs/gnome-control-center/template b/srcpkgs/gnome-control-center/template index 35387271752..0653583c012 100644 --- a/srcpkgs/gnome-control-center/template +++ b/srcpkgs/gnome-control-center/template @@ -1,6 +1,6 @@ # Template file for 'gnome-control-center' pkgname=gnome-control-center -version=3.8.5 +version=3.10.0 revision=1 build_style=gnu-configure configure_args="--disable-static --with-cheese --with-libsocialweb" @@ -8,26 +8,30 @@ short_desc="The GNOME control center" maintainer="Juan RP " license="GPL-2" homepage="http://www.gnome.org" -distfiles="${GNOME_SITE}/$pkgname/3.8/$pkgname-$version.tar.xz" -checksum=efb9fb47aaa9a308aed3064efc39356db05d71ddb0374561eeccc57c122212e2 +distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" +checksum=ea74d87e255308f130039a9afab548ae0416e2c96e69adfc7c794d1775f1474f hostmakedepends="which pkg-config intltool gnome-doc-utils gobject-introspection" -# XXX Printers panel seems to require samba4. -makedepends="libXi-devel colord-devel>=0.1.3 gsettings-desktop-schemas-devel - gnome-desktop-devel>=3.8 libgnomekbd-devel>=3.6.0 +# XXX Printers panel needs smbclient.pc +makedepends="libXi-devel colord-devel>=0.1.3 libsocialweb-devel>=0.25.21 + gsettings-desktop-schemas-devel>=3.10 + gnome-desktop-devel>=3.10 libgnomekbd-devel>=3.6.0 gnome-menus-devel>=3.8 network-manager-applet-devel - gnome-settings-daemon-devel>=3.8 gnome-online-accounts-devel>=3.8 - libsocialweb-devel libcanberra-devel polkit-devel libgtop-devel + gnome-settings-daemon-devel>=3.10 gnome-online-accounts-devel>=3.10 + libcanberra-devel polkit-devel libgtop-devel upower-devel pulseaudio-devel libwacom-devel ibus-devel - gnome-bluetooth-devel>=3.8 tzdata systemd-devel cups-devel - libpwquality-devel mit-krb5-devel cheese-devel>=3.8.0 - colord-gtk-devel>=0.1.24 accountsservice-devel vala-devel>=0.20 - ModemManager-devel iso-codes" + gnome-bluetooth-devel>=3.10 tzdata systemd-devel cups-devel + libpwquality-devel mit-krb5-devel cheese-devel>=3.10 + colord-gtk-devel>=0.1.24 accountsservice-devel vala-devel>=0.22 + libXxf86misc-devel ModemManager-devel iso-codes" gnome-control-center_package() { - depends="gsettings-desktop-schemas>=3.8 pulseaudio desktop-file-utils - ModemManager hicolor-icon-theme sound-theme-freedesktop apg iso-codes" + depends="libsocialweb>=0.25.21 + gsettings-desktop-schemas>=3.10 + pulseaudio desktop-file-utils + ModemManager hicolor-icon-theme + sound-theme-freedesktop apg iso-codes" pkg_install() { vmove all } From e0abd4f20bbd864b0f9f0959958f9f4050441d9d Mon Sep 17 00:00:00 2001 From: Juan RP Date: Thu, 26 Sep 2013 19:30:51 +0200 Subject: [PATCH 062/159] gnome-dictionary: update to 3.9.0. --- srcpkgs/gnome-dictionary/template | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/srcpkgs/gnome-dictionary/template b/srcpkgs/gnome-dictionary/template index dd8aa1181f2..7a0a5d92657 100644 --- a/srcpkgs/gnome-dictionary/template +++ b/srcpkgs/gnome-dictionary/template @@ -1,17 +1,17 @@ # Template file for 'gnome-dictionary' pkgname=gnome-dictionary -version=3.8.0 +version=3.9.0 revision=1 build_style=gnu-configure configure_args="--disable-schemas-compile --disable-scrollkeeper" hostmakedepends="which pkg-config intltool itstool gnome-doc-utils" -makedepends="gtk+3-devel>=3.8 gsettings-desktop-schemas-devel>=3.8" +makedepends="gtk+3-devel gsettings-desktop-schemas-devel>=3.10" short_desc="Look up words in dictionary sources" maintainer="Juan RP " homepage="http://www.gnome.org" license="GPL-2" -distfiles="${GNOME_SITE}/$pkgname/3.8/$pkgname-$version.tar.xz" -checksum=faebbca7684aeef5ff4111305bc8e0c1790b0551445df404b68f3d7cf2c50421 +distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" +checksum=4881096d5952ca39e19e4ecfb37f16634d5f5c1e41ee1e74fa8550f59f5bd455 post_install() { # Remove -devel stuff. @@ -22,7 +22,7 @@ post_install() { gnome-dictionary_package() { replaces="gnome-utils>=3.0" depends="hicolor-icon-theme desktop-file-utils - gsettings-desktop-schemas>=3.6.0" + gsettings-desktop-schemas>=3.10" pkg_install() { vmove all } From 5bc44ef1eab50f0f14e601da515140032fdc982d Mon Sep 17 00:00:00 2001 From: Juan RP Date: Thu, 26 Sep 2013 20:10:30 +0200 Subject: [PATCH 063/159] xz: update to 5.1.2alpha (sigh, required by gnome-disk-utility-3.9). --- srcpkgs/xz/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/xz/template b/srcpkgs/xz/template index 41480c5fcf6..e0f6b0d5e2e 100644 --- a/srcpkgs/xz/template +++ b/srcpkgs/xz/template @@ -1,14 +1,14 @@ # Template file for 'xz' pkgname=xz -version=5.0.5 +version=5.1.2alpha revision=1 build_style=gnu-configure short_desc="The XZ utilities" maintainer="Juan RP " license="Public domain, GPL-2, GPL-3, LGPL-2.1" homepage="http://tukani.org/xz" -distfiles="http://tukaani.org/xz/xz-${version}.tar.bz2" -checksum=166c48d2842519bc4f96333bff9e265f8cdda44d38e40594ef3f9bbb52890490 +distfiles="http://tukaani.org/xz/xz-${version}.tar.gz" +checksum=70e792d2a67cfbb8f2dffd0feab6ca6e5a4a618d65070fb44a367629d1ba94e5 liblzma_package() { short_desc="XZ-format compression library" @@ -33,6 +33,6 @@ liblzma-devel_package() { xz_package() { conflicts="chroot-xz>=0" pkg_install() { - vmove usr + vmove all } } From 7686d3dbf874a171f002f92236defb7106ee7a39 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Thu, 26 Sep 2013 20:12:10 +0200 Subject: [PATCH 064/159] gnome-disk-utility: update to 3.9.0. --- srcpkgs/gnome-disk-utility/template | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/srcpkgs/gnome-disk-utility/template b/srcpkgs/gnome-disk-utility/template index 9182aa37bb3..61c62e0d9ac 100644 --- a/srcpkgs/gnome-disk-utility/template +++ b/srcpkgs/gnome-disk-utility/template @@ -1,23 +1,23 @@ # Template file for 'gnome-disk-utility' pkgname=gnome-disk-utility -version=3.8.2 +version=3.9.0 revision=1 build_style=gnu-configure configure_args="--disable-static" hostmakedepends="pkg-config intltool gnome-doc-utils" -makedepends="gtk+3-devel>=3.8 libcanberra-devel udisks2-devel +makedepends="liblzma-devel>=5.1 gtk+3-devel libcanberra-devel udisks2-devel libdvdread-devel libsecret-devel libpwquality-devel systemd-devel gnome-settings-daemon-devel>=3.8 libnotify-devel" short_desc="GNOME libraries and applications for dealing with storage devices" maintainer="Juan RP " homepage="http://www.gnome.org" license="GPL-2" -distfiles="${GNOME_SITE}/$pkgname/3.8/$pkgname-$version.tar.xz" -checksum=6a64de6f40ddfebfe7566f3ef7856c1cb33fab7d21d9be43db74f014309298c3 +distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" +checksum=704bc3afc01c120a2651b8000f64f53308e6aaa5e155cda3700af27cd32d6f04 gnome-disk-utility_package() { - depends="hicolor-icon-theme desktop-file-utils parted" + depends="liblzma>=5.1 hicolor-icon-theme desktop-file-utils" pkg_install() { - vmove usr + vmove all } } From 710874e44b84647b60b3e62770540b4bcb878414 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Thu, 26 Sep 2013 20:13:35 +0200 Subject: [PATCH 065/159] gnome-font-viewer: update to 3.10.0. --- srcpkgs/gnome-font-viewer/template | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/srcpkgs/gnome-font-viewer/template b/srcpkgs/gnome-font-viewer/template index 03515bde4ec..b47ebb43ab4 100644 --- a/srcpkgs/gnome-font-viewer/template +++ b/srcpkgs/gnome-font-viewer/template @@ -1,22 +1,22 @@ # Template file for 'gnome-font-viewer' pkgname=gnome-font-viewer -version=3.8.0 +version=3.10.0 revision=1 build_style=gnu-configure configure_args="--disable-schemas-compile --disable-scrollkeeper" hostmakedepends="which pkg-config intltool itstool gnome-doc-utils" -makedepends="gtk+3-devel>=3.8 gnome-desktop-devel>=3.8" +makedepends="gtk+3-devel gnome-desktop-devel>=3.10" short_desc="A font viewer for GNOME" maintainer="Juan RP " homepage="http://www.gnome.org" license="GPL-2" -distfiles="${GNOME_SITE}/$pkgname/3.8/$pkgname-$version.tar.xz" -checksum=d34f17f026b7c41d8de5c255070c79c938ce69030b3429444e7fb8f2275ff819 +distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" +checksum=3928350f58ac6c95f44b64cba1a5f03437b19d9b2645a7b01176067504fdd652 gnome-font-viewer_package() { replaces="gnome-utils>=3.0" depends="desktop-file-utils" pkg_install() { - vmove usr + vmove all } } From 1cc78ef830c962c0f7c131373a901a31561fcef6 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Thu, 26 Sep 2013 20:14:38 +0200 Subject: [PATCH 066/159] gnome-icon-theme: update to 3.10.0. --- srcpkgs/gnome-icon-theme/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/gnome-icon-theme/template b/srcpkgs/gnome-icon-theme/template index f0bd9a87b57..9aad618de26 100644 --- a/srcpkgs/gnome-icon-theme/template +++ b/srcpkgs/gnome-icon-theme/template @@ -1,6 +1,6 @@ # Template build file for 'gnome-icon-theme'. pkgname=gnome-icon-theme -version=3.8.3 +version=3.10.0 revision=1 build_style=gnu-configure configure_args="--enable-icon-mapping" @@ -9,8 +9,8 @@ short_desc="Theme consisting of a set of icons for GNOME" maintainer="Juan RP " homepage="http://www.gnome.org" license="GPL-2" -distfiles="${GNOME_SITE}/$pkgname/3.8/$pkgname-$version.tar.xz" -checksum=452ce3be9589d27a69f3ee79067e0d588f63d51fec911a583c4e37b7e46c6b6c +distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" +checksum=c65472b5846c67b97fe75200c5180faccd1347a04caa8390fc0ad23de75b36f6 post_install() { rm -f ${DESTDIR}/usr/share/icons/gnome/icon-theme.cache From 898415a1f17c9256e8bd9c2e8446d3d0250ece72 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Thu, 26 Sep 2013 20:16:14 +0200 Subject: [PATCH 067/159] gnome-icon-theme-symbolic: update to 3.10.0. --- srcpkgs/gnome-icon-theme-symbolic/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/gnome-icon-theme-symbolic/template b/srcpkgs/gnome-icon-theme-symbolic/template index f2d236d7b3e..8b86e21a7d2 100644 --- a/srcpkgs/gnome-icon-theme-symbolic/template +++ b/srcpkgs/gnome-icon-theme-symbolic/template @@ -1,6 +1,6 @@ # Template build file for 'gnome-icon-theme-symbolic'. pkgname=gnome-icon-theme-symbolic -version=3.8.3 +version=3.10.0 revision=1 build_style=gnu-configure configure_args="GTK_UPDATE_ICON_CACHE=/bin/true" @@ -9,11 +9,11 @@ short_desc="GNOME Desktop icon theme (symbolic icons)" maintainer="Juan RP " homepage="http://www.gnome.org" license="GPL-2" -distfiles="${GNOME_SITE}/$pkgname/3.8/$pkgname-$version.tar.xz" -checksum=1851faa5c827e2efa1c3cbe42b6fa8c3db83a0d57c4a534ce0f3bc539123930f +distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" +checksum=70d3ed884cbee59f2335198b5759d09ab1e075df1ced2730c20c926dd3670334 gnome-icon-theme-symbolic_package() { - depends="gnome-icon-theme>=3.8.0" + depends="gnome-icon-theme>=${version}" noarch="yes" pkg_install() { vmove all From ad9b2a677915e5de6bb6c71a0933ecb6344b8ee3 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Thu, 26 Sep 2013 20:20:57 +0200 Subject: [PATCH 068/159] gnome-keyring: update to 3.10.0. --- srcpkgs/gnome-keyring/template | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/srcpkgs/gnome-keyring/template b/srcpkgs/gnome-keyring/template index f065055e369..11720389644 100644 --- a/srcpkgs/gnome-keyring/template +++ b/srcpkgs/gnome-keyring/template @@ -1,23 +1,22 @@ # Template file for 'gnome-keyring' pkgname=gnome-keyring -version=3.8.2 +version=3.10.0 revision=1 build_style=gnu-configure -configure_args="--with-pam-dir=/usr/lib/security --disable-debug - --disable-schemas-compile" +configure_args="--with-pam-dir=/usr/lib/security --disable-schemas-compile" hostmakedepends="pkg-config intltool libtasn1-tools" makedepends="dbus-devel libcap-ng-devel pam-devel libcap-devel libtasn1-devel - libgcrypt-devel gcr-devel>=3.8" + libgcrypt-devel gcr-devel>=3.10" short_desc="GNOME password and secret manager" maintainer="Juan RP " homepage="http://www.gnome.org" license="GPL, LGPL" -distfiles="${GNOME_SITE}/$pkgname/3.8/$pkgname-$version.tar.xz" -checksum=f05692bb32db4d1afa65205ac4e68fa2b79107aca2393e237cf38f880cb7b868 +distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" +checksum=1cc87260fa17b8e39071fdae0418cd9ca5f913d50e23d8f456f3e2c6d6d22213 gnome-keyring_package() { # For setcap(8). - depends="libcap-progs dconf gcr>=3.8.0" + depends="libcap-progs dconf>=0.18 gcr>=3.10" pkg_install() { vmove all } From 4e816841a6b1b658fea520116a9d926b73f7d59e Mon Sep 17 00:00:00 2001 From: Juan RP Date: Thu, 26 Sep 2013 20:29:11 +0200 Subject: [PATCH 069/159] libzapojit: bump dep requirements. --- srcpkgs/libzapojit/template | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/srcpkgs/libzapojit/template b/srcpkgs/libzapojit/template index 92f8e60ac7f..0192ecfc916 100644 --- a/srcpkgs/libzapojit/template +++ b/srcpkgs/libzapojit/template @@ -1,11 +1,11 @@ # Template file for 'libzapojit' pkgname=libzapojit version=0.0.3 -revision=2 +revision=3 build_style=gnu-configure configure_args="--disable-static" hostmakedepends="pkg-config intltool gobject-introspection" -makedepends="json-glib-devel rest-devel gnome-online-accounts-devel>=3.8" +makedepends="json-glib-devel rest-devel>=0.7.90 gnome-online-accounts-devel>=3.10" short_desc="GLib/GObject wrapper for the SkyDrive and Hotmail REST APIs" maintainer="Juan RP " license="LGPL-2.1" @@ -14,19 +14,21 @@ distfiles="${GNOME_SITE}/$pkgname/0.0/$pkgname-$version.tar.xz" checksum=3d25f99329105abb99d1e9651b0aa1842065456ea54c22970a7330e9f3d1c37e libzapojit-devel_package() { - depends="libglib-devel json-glib-devel libsoup-devel rest-devel + depends="libglib-devel json-glib-devel rest-devel>=0.7.90 ${sourcepkg}-${version}_${revision}" - short_desc="${short_desc} - development files" + short_desc+=" - development files" pkg_install() { vmove usr/include vmove usr/lib/pkgconfig vmove usr/share/gir-1.0 vmove usr/share/gtk-doc + vmove "usr/lib/*.so" } } libzapojit_package() { + depends="rest>=0.7.90" pkg_install() { - vmove usr + vmove all } } From 1078d81436a9a72c3b627e503f4f1a11e3fd1d40 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Thu, 26 Sep 2013 20:33:34 +0200 Subject: [PATCH 070/159] New package: gnome-online-miners-3.10.0. --- srcpkgs/gnome-online-miners/template | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 srcpkgs/gnome-online-miners/template diff --git a/srcpkgs/gnome-online-miners/template b/srcpkgs/gnome-online-miners/template new file mode 100644 index 00000000000..946dc37cbb1 --- /dev/null +++ b/srcpkgs/gnome-online-miners/template @@ -0,0 +1,21 @@ +# Template file for 'gnome-online-miners' +pkgname=gnome-online-miners +version=3.10.0 +revision=1 +build_style=gnu-configure +configure_args="--disable-static" +hostmakedepends="pkg-config intltool libxslt docbook-xsl gobject-introspection" +makedepends="libzapojit-devel>=0.0.3_3 libgdata-devel>=0.14 grilo-devel tracker-devel" +short_desc="GNOME service that crawls through your online content" +maintainer="Juan RP " +homepage="http://www.gnome.org" +license="GPL-2" +distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" +checksum=a4ca0d78452f8d19ed4eedeb5164b93aead9566cb9e2cf9826d49e3bad02a504 + +gnome-online-miners_package() { + depends="libzapojit>=0.0.3_3 libgdata>=0.14" + pkg_install() { + vmove all + } +} From 3fa6c22dfe03b549a4f98851c45c9171fa4b6044 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Thu, 26 Sep 2013 20:35:06 +0200 Subject: [PATCH 071/159] gnome-screenshot: update to 3.10.0. --- srcpkgs/gnome-screenshot/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/gnome-screenshot/template b/srcpkgs/gnome-screenshot/template index 731a19160a3..42afa7bd28a 100644 --- a/srcpkgs/gnome-screenshot/template +++ b/srcpkgs/gnome-screenshot/template @@ -1,6 +1,6 @@ # Template file for 'gnome-screenshot' pkgname=gnome-screenshot -version=3.8.3 +version=3.10.0 revision=1 build_style=gnu-configure configure_args="--disable-schemas-compile" @@ -10,8 +10,8 @@ short_desc="A screenshot capture utility for GNOME" maintainer="Juan RP " homepage="http://www.gnome.org" license="GPL-2" -distfiles="${GNOME_SITE}/$pkgname/3.8/$pkgname-$version.tar.xz" -checksum=05d638d53da334aa8818e83ed3f91a17334c48c707d728426414033607582971 +distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" +checksum=709de9b9c66f569f4984152376479ca2c4aa47c9e5aa5e7385e417c9fe3465d9 gnome-screenshot_package() { depends="desktop-file-utils" From 373cc541c58a46a47207d8df8ee03ada1051b2e9 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Thu, 26 Sep 2013 20:36:52 +0200 Subject: [PATCH 072/159] gnome-user-docs: update to 3.10.0. --- srcpkgs/gnome-user-docs/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/gnome-user-docs/template b/srcpkgs/gnome-user-docs/template index 5bf278be151..895549dde4d 100644 --- a/srcpkgs/gnome-user-docs/template +++ b/srcpkgs/gnome-user-docs/template @@ -1,6 +1,6 @@ # Template file for 'gnome-user-docs' pkgname=gnome-user-docs -version=3.8.2 +version=3.10.0 revision=1 build_style=gnu-configure hostmakedepends="pkg-config intltool itstool gnome-doc-utils" @@ -9,8 +9,8 @@ homepage="http://www.gnome.org" short_desc="User documentation for GNOME" maintainer="Juan RP " license="GPL-2" -distfiles="${GNOME_SITE}/$pkgname/3.8/$pkgname-$version.tar.xz" -checksum=eeb96fcd0c253ce9869fe2007402220f2924fa37217c6fac357db236797cadb7 +distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" +checksum=986610c7d9849a9817e8f5f133cbda2bbeab2198b51271aa06ec3d1968f6897f gnome-user-docs_package() { depends="yelp" From 1d9ef2b675e490709024b46c702ca93d53e6618d Mon Sep 17 00:00:00 2001 From: Juan RP Date: Thu, 26 Sep 2013 20:42:24 +0200 Subject: [PATCH 073/159] gnome-themes-standard: update to 3.10.0. --- srcpkgs/gnome-themes-standard/template | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/srcpkgs/gnome-themes-standard/template b/srcpkgs/gnome-themes-standard/template index 613cfc100f5..7466178292a 100644 --- a/srcpkgs/gnome-themes-standard/template +++ b/srcpkgs/gnome-themes-standard/template @@ -1,16 +1,16 @@ # Template build file for 'gnome-themes-standard'. pkgname=gnome-themes-standard -version=3.8.4 +version=3.10.0 revision=1 build_style=gnu-configure -hostmakedepends="pkg-config intltool" -makedepends="gtk+-devel gtk+3-devel>=3.8 librsvg-devel" +hostmakedepends="pkg-config intltool librsvg-utils" +makedepends="gtk+-devel gtk+3-devel>=3.8 librsvg-devel>=2.39" short_desc="Standard GNOME themes" maintainer="Juan RP " homepage="http://www.gnome.org" license="LGPL-2.1" -distfiles="${GNOME_SITE}/$pkgname/3.8/$pkgname-$version.tar.xz" -checksum=1252d719847cab54cc0dc510c3d3698462dcb1b45fabd9643473ac28e5cd7a20 +distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" +checksum=812c6cfc534fced921dc327b436e70020d8979529284bb59d72d6f37af1f4b38 post_install() { for f in ${gtk_iconcache_dirs}; do From e4c07cd07d30a243262f19d73f25b6bf3037604a Mon Sep 17 00:00:00 2001 From: Juan RP Date: Thu, 26 Sep 2013 20:46:19 +0200 Subject: [PATCH 074/159] gnome-terminal: update to 3.10.0. --- srcpkgs/gnome-terminal/template | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/srcpkgs/gnome-terminal/template b/srcpkgs/gnome-terminal/template index 3bab10e580d..96dde35c83a 100644 --- a/srcpkgs/gnome-terminal/template +++ b/srcpkgs/gnome-terminal/template @@ -1,17 +1,19 @@ # Template file for 'gnome-terminal' pkgname=gnome-terminal -version=3.8.4 +version=3.10.0 revision=1 build_style=gnu-configure +configure_args="--disable-static --with-nautilus-extension" hostmakedepends="which pkg-config intltool itstool gnome-doc-utils" -makedepends="gtk+3-devel>=3.8 vte3-devel dconf-devel libuuid-devel - gsettings-desktop-schemas-devel>=3.8 GConf-devel desktop-file-utils" +makedepends="gtk+3-devel>=3.8 vte3-devel dconf-devel>=0.18 libuuid-devel + gsettings-desktop-schemas-devel>=3.10 nautilus-devel>=3.10 + GConf-devel desktop-file-utils" short_desc="The GNOME terminal emulator application" maintainer="Juan RP " homepage="http://www.gnome.org" license="GPL-2" -distfiles="${GNOME_SITE}/$pkgname/3.8/$pkgname-$version.tar.xz" -checksum=5c1a1db9b4c5eb5780137bed5ed6a05afd82053bd5b2ad41180d4617c56a3f22 +distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" +checksum=2f7cc56d39e083eee0419c7d7e9ae43e00dca8bc55bdd31271fb193ec7f63796 gnome-terminal_package() { depends="desktop-file-utils" From f47a749af325a3fbb669cf8254d4dc9250960a54 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Thu, 26 Sep 2013 20:53:20 +0200 Subject: [PATCH 075/159] glibmm: update to 2.37.93. --- srcpkgs/glibmm/template | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/srcpkgs/glibmm/template b/srcpkgs/glibmm/template index 567e48b9d83..c21533cd4da 100644 --- a/srcpkgs/glibmm/template +++ b/srcpkgs/glibmm/template @@ -1,16 +1,16 @@ # Template build file for 'glibmm' pkgname=glibmm -version=2.36.2 +version=2.37.93 revision=1 build_style=gnu-configure hostmakedepends="pkg-config intltool" -makedepends="libglib-devel>=2.36.1 libsigc++-devel>=2.2.10" +makedepends="libglib-devel>=2.38 libsigc++-devel>=2.2.10" short_desc="C++ bindings for GLib" maintainer="Juan RP " homepage="http://gtkmm.sourceforge.net/" license="LGPL-2.1" -distfiles="${GNOME_SITE}/glibmm/2.36/glibmm-$version.tar.xz" -checksum=f15b65bf5740257be03c69f2f5ae71436ac3011ebeb02274b2b99b796c6837cf +distfiles="${GNOME_SITE}/glibmm/${version%.*}/glibmm-$version.tar.xz" +checksum=a01031d7d05ba9df5915fc84867303c93341a8dd13a2aa5af78a71dfb46842f6 long_desc=" glibmm (previously known as GLib--) is the official C++ interface for the popular GUI library GTK+. Highlights include typesafe callbacks, widgets @@ -26,12 +26,13 @@ glibmm-devel_package() { vmove usr/lib/giomm-2.4 vmove usr/lib/glibmm-2.4 vmove usr/lib/pkgconfig + vmove "usr/lib/*.so" } } glibmm_package() { - depends="glib>=2.36.1" + depends="glib>=2.38" pkg_install() { - vmove usr + vmove all } } From 642823c5075cd900244be02129f5ac0c5d7ecfc0 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Thu, 26 Sep 2013 20:56:55 +0200 Subject: [PATCH 076/159] gtkmm: update to 3.9.16. --- srcpkgs/gtkmm/template | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/srcpkgs/gtkmm/template b/srcpkgs/gtkmm/template index 001f1a82d7e..d7db8519bfb 100644 --- a/srcpkgs/gtkmm/template +++ b/srcpkgs/gtkmm/template @@ -1,17 +1,17 @@ # Template build file for 'gtkmm'. pkgname=gtkmm -version=3.8.1 +version=3.9.16 revision=1 build_style=gnu-configure configure_args="--disable-documentation" hostmakedepends="pkg-config" -makedepends="gtk+3-devel>=3.8.1 glibmm-devel>=2.36 atkmm-devel pangomm-devel" +makedepends="gtk+3-devel>=3.10 glibmm-devel>=2.37 atkmm-devel pangomm-devel" short_desc="C++ bindings for The GTK+ toolkit (v2)" maintainer="Juan RP " homepage="http://gtkmm.sourceforge.net/" license="LGPL-2.1" -distfiles="${GNOME_SITE}/gtkmm/3.8/gtkmm-$version.tar.xz" -checksum=d374c6d6d78fd9f61bca737cd7c23452de427a1662de8abf46df784e07e4c95b +distfiles="${GNOME_SITE}/gtkmm/${version%.*}/gtkmm-$version.tar.xz" +checksum=3a07679530c0c58ddaf3b2bdc7859d8f7050a1057ae99e2d3857004e36e7c879 long_desc=" gtkmm (previously known as Gtk--) is the official C++ interface for the popular GUI library GTK+. Highlights include typesafe callbacks, widgets @@ -24,19 +24,20 @@ long_desc=" bindings for the ATK library." gtkmm-devel_package() { - depends="gtk+3-devel>=3.8 glibmm-devel>=2.35.9 atkmm-devel + depends="gtk+3-devel>=3.10 glibmm-devel>=2.37 atkmm-devel pangomm-devel cairomm-devel gtkmm-${version}_${revision}" short_desc+=" - development files" pkg_install() { vmove usr/include vmove "usr/lib/g[dt]k*" vmove usr/lib/pkgconfig + vmove "usr/lib/*.so" } } gtkmm_package() { - depends="gtk+3>=3.8.1" + depends="gtk+3>=3.10" pkg_install() { - vmove usr + vmove all } } From efc1090f1107a31e76577df7c6be135d631fe95f Mon Sep 17 00:00:00 2001 From: Juan RP Date: Thu, 26 Sep 2013 20:59:35 +0200 Subject: [PATCH 077/159] gnome-system-monitor: update to 3.10.0. --- srcpkgs/gnome-system-monitor/template | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/srcpkgs/gnome-system-monitor/template b/srcpkgs/gnome-system-monitor/template index 0218952aeb2..073219dc7bd 100644 --- a/srcpkgs/gnome-system-monitor/template +++ b/srcpkgs/gnome-system-monitor/template @@ -1,21 +1,21 @@ # Template file for 'gnome-system-monitor' pkgname=gnome-system-monitor -version=3.8.2.1 +version=3.10.0 revision=1 build_style=gnu-configure configure_args="--disable-schemas-compile --enable-systemd" hostmakedepends="which pkg-config intltool itstool gnome-doc-utils" -makedepends="libwnck-devel gtkmm-devel librsvg-devel systemd-devel libgtop-devel - gnome-icon-theme>=3.8" +makedepends="libwnck-devel gtkmm-devel>=3.9 librsvg-devel systemd-devel libgtop-devel + gnome-icon-theme>=3.10" short_desc="Process viewer and system resource monitor for GNOME" maintainer="Juan RP " homepage="http://www.gnome.org" license="GPL-2" -distfiles="${GNOME_SITE}/$pkgname/3.8/$pkgname-$version.tar.xz" -checksum=df4d2c4dbb4f3408b621140732efb3e38853658addd6aae73613027856f6bb44 +distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" +checksum=a6bd4e925b21db08e687f7b71a0363777e1dbdda143142232c1c78ecf14821ac gnome-system-monitor_package() { - depends="gnome-icon-theme>=3.8" + depends="gtkmm>=3.9 gnome-icon-theme>=3.10" pkg_install() { vmove all } From 453d1bf7a4b36819799f78abf6cf464ef4b3de9d Mon Sep 17 00:00:00 2001 From: Juan RP Date: Thu, 26 Sep 2013 21:01:23 +0200 Subject: [PATCH 078/159] gnome-system-log: update to 3.9.90. --- srcpkgs/gnome-system-log/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/gnome-system-log/template b/srcpkgs/gnome-system-log/template index 475e0037b3f..b6cc8ac8567 100644 --- a/srcpkgs/gnome-system-log/template +++ b/srcpkgs/gnome-system-log/template @@ -1,6 +1,6 @@ # Template file for 'gnome-system-log' pkgname=gnome-system-log -version=3.8.1 +version=3.9.90 revision=1 build_style=gnu-configure configure_args="--disable-schemas-compile" @@ -10,12 +10,12 @@ short_desc="A system log viewer for GNOME" maintainer="Juan RP " homepage="http://www.gnome.org" license="GPL-2" -distfiles="${GNOME_SITE}/$pkgname/3.8/$pkgname-$version.tar.xz" -checksum=2393d00e059212b5a1135589d11412c0639fe9e60958ccff1bac238139dd4967 +distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" +checksum=9eeb51982d347aa7b33703031e2c1d8084201374665425cd62199649b29a5411 gnome-system-log_package() { depends="hicolor-icon-theme desktop-file-utils" pkg_install() { - vmove usr + vmove all } } From 6d007b4c169af5e009762cf414f862da33a203b6 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Thu, 26 Sep 2013 21:03:18 +0200 Subject: [PATCH 079/159] gtksourceview: update to 3.10.0. --- srcpkgs/gtksourceview/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/gtksourceview/template b/srcpkgs/gtksourceview/template index 51070d20918..a24919d7381 100644 --- a/srcpkgs/gtksourceview/template +++ b/srcpkgs/gtksourceview/template @@ -1,6 +1,6 @@ # Template file for 'gtksourceview' pkgname=gtksourceview -version=3.8.2 +version=3.10.0 revision=1 build_style=gnu-configure configure_args="--disable-static" @@ -10,8 +10,8 @@ short_desc="Text widget that extends GTK+3 GtkTextView widget" maintainer="Juan RP " homepage="http://www.gnome.org" license="GPL-2" -distfiles="${GNOME_SITE}/$pkgname/3.8/${pkgname}-${version}.tar.xz" -checksum=1c2a01f1e04e3c8c9f09ff22f34f73f17b0e4e7ff0d83b2996c209bd02a6501b +distfiles="${GNOME_SITE}/$pkgname/${version%.*}/${pkgname}-${version}.tar.xz" +checksum=5208afa6edccf4d70a30ed1da399cefcceb8a8b879305d491be4be3e3d6ef776 gtksourceview-devel_package() { depends="gtk+3-devel libxml2-devel ${sourcepkg}-${version}_${revision}" @@ -27,6 +27,6 @@ gtksourceview-devel_package() { gtksourceview_package() { pkg_install() { - vmove usr + vmove all } } From 5b7ff657f6d375e380f06901f7e5a30a49b52edb Mon Sep 17 00:00:00 2001 From: Juan RP Date: Thu, 26 Sep 2013 21:05:12 +0200 Subject: [PATCH 080/159] pygobject: update to 3.10.0. --- srcpkgs/pygobject/template | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/srcpkgs/pygobject/template b/srcpkgs/pygobject/template index a7ba26cde48..463d66606dd 100644 --- a/srcpkgs/pygobject/template +++ b/srcpkgs/pygobject/template @@ -1,16 +1,16 @@ # Template file for 'pygobject' pkgname=pygobject -version=3.8.3 +version=3.10.0 revision=1 build_style=gnu-configure -hostmakedepends="pkg-config gobject-introspection>=1.36" +hostmakedepends="pkg-config gobject-introspection>=1.38" makedepends="pycairo-devel libglib-devel python-devel" short_desc="Python bindings for GObject" homepage="http://www.pygtk.org/" license="LGPL-2.1" -distfiles="${GNOME_SITE}/$pkgname/3.8/$pkgname-$version.tar.xz" +distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" maintainer="Juan RP " -checksum=384b3e1b8d1e7c8796d7eb955380d62946dd0ed9c54ecf0817af2d6b254e082c +checksum=8aaa1f83fdb2e30bae77405a63a8be600b311a04a4cdc952b2ab62ee81aad077 pygobject-devel_package() { depends="libffi-devel libglib-devel libgirepository-devel @@ -19,6 +19,7 @@ pygobject-devel_package() { pkg_install() { vmove usr/include vmove usr/lib/pkgconfig + vmove "usr/lib/*.so" } } From eb66405704ffc9849216018490448149ffcac755 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Thu, 26 Sep 2013 21:05:56 +0200 Subject: [PATCH 081/159] yelp-xsl: update to 3.10.0. --- srcpkgs/yelp-xsl/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/yelp-xsl/template b/srcpkgs/yelp-xsl/template index 089444c2dbd..08583df3c63 100644 --- a/srcpkgs/yelp-xsl/template +++ b/srcpkgs/yelp-xsl/template @@ -1,6 +1,6 @@ # Template file for 'yelp-xsl' pkgname=yelp-xsl -version=3.8.1 +version=3.10.0 revision=1 build_style=gnu-configure hostmakedepends="pkg-config intltool itstool libxslt" @@ -9,8 +9,8 @@ short_desc="Help browser for GNOME desktop - XSL and misc files" maintainer="Juan RP " license="GPL-2" homepage="http://www.gnome.org" -distfiles="${GNOME_SITE}/$pkgname/3.8/$pkgname-$version.tar.xz" -checksum=afc519be07ffcbdcc20d1acfd1d901cfd03c7b4cf0667036534f2726bb68b40d +distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" +checksum=cf5af9978b86e32e4adef01d128f491badb3b24b1f16569ad7bced1bfbbde502 yelp-xsl_package() { noarch="yes" From 81c14473963ae5bf1811fe9df00997141ebc7afe Mon Sep 17 00:00:00 2001 From: Juan RP Date: Thu, 26 Sep 2013 21:09:50 +0200 Subject: [PATCH 082/159] yelp: update to 3.10.0. --- srcpkgs/yelp/template | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/srcpkgs/yelp/template b/srcpkgs/yelp/template index 51ec6178ac8..dc4ee345991 100644 --- a/srcpkgs/yelp/template +++ b/srcpkgs/yelp/template @@ -1,18 +1,19 @@ # Template file for 'yelp' pkgname=yelp -version=3.8.1 +version=3.10.0 revision=1 build_style=gnu-configure configure_args="--disable-schemas-compile --disable-static" hostmakedepends="pkg-config intltool itstool" -makedepends="bzip2-devel liblzma-devel sqlite-devel libgpg-error-devel - libgcrypt-devel libxslt-devel libsoup-devel webkitgtk-devel yelp-xsl>=${version}" +makedepends="bzip2-devel liblzma-devel>=5.1 sqlite-devel libgpg-error-devel + libgcrypt-devel libxslt-devel libsoup-devel>=2.44 webkitgtk-devel>=2.1 + yelp-xsl>=${version}" short_desc="Help browser for GNOME desktop" maintainer="Juan RP " homepage="http://www.gnome.org" license="GPL-2" -distfiles="${GNOME_SITE}/$pkgname/3.8/$pkgname-$version.tar.xz" -checksum=73b3941316194dea8ea7d1d2b1f6612424c5d80ee1871ef627455893ad15606e +distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" +checksum=146f64a9b69409bedc5a0af9376ff2a38e5a4adcfa93c52c95d4ea4dc868cbd2 yelp-devel_package() { depends="yelp>=${version}" @@ -20,11 +21,12 @@ yelp-devel_package() { pkg_install() { vmove usr/include vmove usr/share/gtk-doc + vmove "usr/lib/*.so" } } yelp_package() { - depends="dconf>=0.16 hicolor-icon-theme desktop-file-utils yelp-xsl>=${version}" + depends="libsoup>=2.44 webkitgtk>=2.1 dconf>=0.18 hicolor-icon-theme desktop-file-utils yelp-xsl>=${version}" pkg_install() { vmove all } From b9a969d5ea9a06aae970a0902d8e532f5602df4f Mon Sep 17 00:00:00 2001 From: Juan RP Date: Thu, 26 Sep 2013 21:11:54 +0200 Subject: [PATCH 083/159] vino: update to 3.10.0. --- srcpkgs/vino/template | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/srcpkgs/vino/template b/srcpkgs/vino/template index 9d01fb35e95..8f3d66dc17b 100644 --- a/srcpkgs/vino/template +++ b/srcpkgs/vino/template @@ -1,24 +1,24 @@ # Template file for 'vino' pkgname=vino -version=3.8.1 +version=3.10.0 revision=1 build_style=gnu-configure configure_args="--disable-schemas-compile" hostmakedepends="pkg-config intltool gnome-doc-utils" -makedepends="libjpeg-turbo-devel gtk+3-devel>=3.8.0 +makedepends="libjpeg-turbo-devel gtk+3-devel>=3.10 libnotify-devel avahi-glib-libs-devel dbus-glib-devel telepathy-glib-devel - libsoup-devel libXtst-devel NetworkManager-devel libsecret-devel + libsoup-devel>=2.44 libXtst-devel NetworkManager-devel libsecret-devel gnutls-devel>=3.1.5 libSM-devel desktop-file-utils" short_desc="VNC server for the GNOME desktop" maintainer="Juan RP " homepage="http://www.gnome.org" license="GPL-2" -distfiles="${GNOME_SITE}/$pkgname/3.8/$pkgname-$version.tar.xz" -checksum=3a82392aa479d5a4be38020ac64b3c4f0227917af6175938919dbe741995929c +distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" +checksum=927b71eaafc5ac4c6e098fb9ff0164899eae3ca599a32f5d18897a02b4be1fdd vino_package() { - depends="desktop-file-utils" + depends="libsoup>=2.44 desktop-file-utils" pkg_install() { - vmove usr + vmove all } } From effb0a4061bad27c7fce61d4a61ed53fe7cde9d1 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Thu, 26 Sep 2013 21:17:10 +0200 Subject: [PATCH 084/159] totem-pl-parser: update to 3.10.0 (soname bump). --- common/shlibs | 4 ++-- srcpkgs/totem-pl-parser/template | 13 ++++++++----- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/common/shlibs b/common/shlibs index 183ef331944..b57a1066403 100644 --- a/common/shlibs +++ b/common/shlibs @@ -659,8 +659,8 @@ libpulsecommon-4.0.so libpulseaudio-4.0_1 liborc-0.4.so.0 orc-0.4.11_1 liborc-test-0.4.so.0 orc-0.4.11_1 libgmime-2.6.so.0 gmime-2.6.4_1 -libtotem-plparser.so.17 totem-pl-parser-2.32.0_1 -libtotem-plparser-mini.so.17 totem-pl-parser-2.32.0_1 +libtotem-plparser.so.18 totem-pl-parser-3.10.0_1 +libtotem-plparser-mini.so.18 totem-pl-parser-3.10.0_1 libgladeui-2.so.0 libgladeui3-3.10.0_1 libgladeui-2.so.4 libgladeui3-3.14.1_1 libgstvdp-0.10.so.0 gst-plugins-bad-0.10.20_1 diff --git a/srcpkgs/totem-pl-parser/template b/srcpkgs/totem-pl-parser/template index 57015a19300..35420903e7f 100644 --- a/srcpkgs/totem-pl-parser/template +++ b/srcpkgs/totem-pl-parser/template @@ -1,17 +1,18 @@ # Template file for 'totem-pl-parser' pkgname=totem-pl-parser -version=3.4.5 +version=3.10.0 revision=1 build_style=gnu-configure -configure_args="--disable-static --enable-quvi --enable-libarchive --enable-libgcrypt" +# XXX needs libquvi>=0.9 +configure_args="--disable-static --enable-libarchive --enable-libgcrypt" hostmakedepends="pkg-config intltool gobject-introspection" -makedepends="libsoup-gnome-devel gmime-devel libarchive-devel>=3.1.2 libgcrypt-devel libquvi-devel" +makedepends="libsoup-gnome-devel>=2.44 gmime-devel libarchive-devel>=3.1.2 libgcrypt-devel" short_desc="Totem playlist parser library" maintainer="Juan RP " homepage="http://www.gnome.org" license="GPL-2" -distfiles="${GNOME_SITE}/$pkgname/3.4/$pkgname-$version.tar.xz" -checksum=a573e078692b48895cb5b041385b2760d63e2ee496c8d499eccfa942e7c79f89 +distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" +checksum=87eac3fdf2b632dfac0edda07906a3e84f1ce4442b8127394414020dafe41aa9 totem-pl-parser-devel_package() { depends="libglib-devel libxml2-devel gmime-devel libquvi-devel @@ -22,10 +23,12 @@ totem-pl-parser-devel_package() { vmove usr/lib/pkgconfig vmove usr/share/gir-1.0 vmove usr/share/gtk-doc + vmove "usr/lib/*.so" } } totem-pl-parser_package() { + depends="libsoup-gnome>=2.44" pkg_install() { vmove all } From af4477e5bd3f5aceb2ed0da4123bc0fcda9aa6d5 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Thu, 26 Sep 2013 21:18:47 +0200 Subject: [PATCH 085/159] tracker: rebuild against totem-pl-parser-3.10. --- srcpkgs/tracker/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/tracker/template b/srcpkgs/tracker/template index a229404d170..8ace18131e9 100644 --- a/srcpkgs/tracker/template +++ b/srcpkgs/tracker/template @@ -1,7 +1,7 @@ # Template file for 'tracker' pkgname=tracker version=0.16.2 -revision=1 +revision=2 build_style=gnu-configure configure_args="--enable-libflac --enable-libvorbis --disable-unit-tests --enable-libtiff --disable-static --enable-network-manager" @@ -9,7 +9,7 @@ hostmakedepends="pkg-config intltool gobject-introspection" makedepends="libpng-devel>=1.6 libgee-devel libsecret-devel upower-devel exempi-devel poppler-glib-devel gupnp-dlna-devel libgxps-devel libgsf-devel icu-devel>=49 enca-devel libvorbis-devel libflac-devel - taglib-devel giflib-devel>=5.0 totem-pl-parser-devel + taglib-devel giflib-devel>=5.0 totem-pl-parser-devel>=3.10 libexif-devel tiff-devel network-manager-applet-devel sqlite-devel" short_desc="Personal search tool and storage system" maintainer="Juan RP " From 71ac805b36c63ab263039c1df28ca3d72f15c21f Mon Sep 17 00:00:00 2001 From: Juan RP Date: Thu, 26 Sep 2013 21:28:01 +0200 Subject: [PATCH 086/159] grilo-plugins: update to 0.2.9. --- srcpkgs/grilo-plugins/template | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/srcpkgs/grilo-plugins/template b/srcpkgs/grilo-plugins/template index 34fa0217ddd..1f02bc9c8c7 100644 --- a/srcpkgs/grilo-plugins/template +++ b/srcpkgs/grilo-plugins/template @@ -1,21 +1,21 @@ # Template file for 'grilo-plugins' pkgname=grilo-plugins -version=0.2.8 +version=0.2.9 revision=1 build_style=gnu-configure configure_args="--disable-static --enable-shoutcast" hostmakedepends="pkg-config intltool gnome-doc-utils" # XXX missing plugins: dmap and fakemetadata. makedepends="grilo-devel>=0.2.6 gupnp-av-devel json-glib-devel - libquvi-devel rest-devel sqlite-devel libgcrypt-devel gmime-devel - tracker-devel>=0.16 totem-pl-parser-devel libsoup-gnome-devel>=2.42 - libgdata-devel" + libquvi-devel rest-devel>=0.7.90 sqlite-devel libgcrypt-devel gmime-devel + tracker-devel>=0.16_2 totem-pl-parser-devel>=3.10 libgdata-devel>=0.14 + gnome-online-accounts-devel>=3.10" short_desc="Plugins for Grilo" maintainer="Juan RP " license="LGPL-2.1" homepage="http://live.gnome.org/Grilo" -distfiles="${GNOME_SITE}/$pkgname/0.2/$pkgname-$version.tar.xz" -checksum=28f83fd701b33aed7b843e5e3850d7d961310c7cb33ffebcb652160fff8ccd80 +distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" +checksum=902b839bd1cdc27613d9e44af2afe00d1ef3b7471ae72c66c622560007e1023e long_desc=" More precisely, Grilo provides: @@ -28,7 +28,7 @@ long_desc=" * A flexible API that allows plugin developers to write plugins of various kinds." grilo-plugins_package() { - depends="grilo>=0.2.6" + depends="grilo>=0.2.7" pkg_install() { vmove all } From 1106c8663f087f3bcd6c21da0dc2596bbba794ba Mon Sep 17 00:00:00 2001 From: Juan RP Date: Thu, 26 Sep 2013 21:34:37 +0200 Subject: [PATCH 087/159] totem: update to 3.10.0. --- srcpkgs/totem/template | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/srcpkgs/totem/template b/srcpkgs/totem/template index 0b3badc21bb..ac93756fcce 100644 --- a/srcpkgs/totem/template +++ b/srcpkgs/totem/template @@ -1,13 +1,13 @@ # Template file for 'totem' pkgname=totem -version=3.8.2 +version=3.10.0 revision=1 short_desc="A GNOME integrated movie player based on Gstreamer" maintainer="Juan RP " homepage="http://www.gnome.org" license="custom, GPL-2" -distfiles="${GNOME_SITE}/$pkgname/3.8/$pkgname-$version.tar.xz" -checksum=eda9e0a016bb2ac14f7cd7c8c03b8ee1ab3f1b3ba6558f65c64514e5d2583e01 +distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" +checksum=c223e953f9697cc932f3b7efd87cea767a3e5a2ba0e3cda08628aa364caee094 build_style=gnu-configure configure_args="--disable-static --disable-schemas-compile @@ -16,12 +16,13 @@ configure_args="--disable-static --disable-schemas-compile hostmakedepends="which pkg-config intltool gnome-doc-utils itstool gobject-introspection" -makedepends="gnutls-devel gst-plugins-base1-devel totem-pl-parser-devel - libbluetooth-devel evolution-data-server-devel>=3.8.0 dbus-glib-devel - clutter-gst-devel>=2.0.2_2 clutter-gtk-devel>=1.4.4 libSM-devel - libpeas-devel libXtst-devel grilo-devel>=0.2.0 libepc-devel vala-devel>=0.20 - gst-plugins-bad1-devel>=1.0.0_2 gsettings-desktop-schemas-devel>=3.8.0 - libzeitgeist-devel nautilus-devel>=3.8.0 gst-plugins-ugly1 gst-plugins-good1" +# XXX missing zeitgeist (>=0.9.2) and lirc plugins. +makedepends="gnutls-devel gst-plugins-base1-devel>=1:1.2 totem-pl-parser-devel>=3.10 + evolution-data-server-devel>=3.10 dbus-glib-devel + clutter-gst-devel>=2.0.8_2 clutter-gtk-devel>=1.4.4_2 libSM-devel + libpeas-devel>=1.9 libXtst-devel grilo-devel>=0.2.7 libepc-devel vala-devel>=0.22 + gst-plugins-bad1-devel>=1:1.2 gsettings-desktop-schemas-devel>=3.10 + nautilus-devel>=3.10 gst-plugins-ugly1>=1:1.2 gst-plugins-good1>=1:1.2" # XXX xulrunner plugin. # XXX reenable python plugin if pylint pkg exists. @@ -31,7 +32,7 @@ libtotem_package() { short_desc+=" - runtime library" replaces="totem<3.6.2" pkg_install() { - vmove "usr/lib/*.so*" + vmove "usr/lib/*.so.*" vmove usr/lib/girepository-1.0 } } @@ -44,6 +45,7 @@ totem-devel_package() { vmove usr/lib/pkgconfig vmove usr/share/gir-1.0 vmove usr/share/gtk-doc + vmove "usr/lib/*.so" } } @@ -55,8 +57,8 @@ totem-mozilla-plugin_package() { } totem_package() { - depends="grilo-plugins>=0.2.0 hicolor-icon-theme desktop-file-utils - gst-libav gst-plugins-ugly1 gst-plugins-good1" + depends="grilo-plugins>=0.2.9 hicolor-icon-theme desktop-file-utils + gst-libav>=1:1.2 gst-plugins-ugly1>=1:1.2 gst-plugins-good1>=1:1.2" pkg_install() { vmove all } From 5adde0e4a290777990124f650851f17e83273fd9 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Thu, 26 Sep 2013 21:37:05 +0200 Subject: [PATCH 088/159] sushi: update to 3.10.0. --- srcpkgs/sushi/template | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/srcpkgs/sushi/template b/srcpkgs/sushi/template index 4768468c112..98faf92b022 100644 --- a/srcpkgs/sushi/template +++ b/srcpkgs/sushi/template @@ -1,22 +1,22 @@ # Template file for 'sushi' pkgname=sushi -version=3.8.1 +version=3.10.0 revision=1 build_style=gnu-configure hostmakedepends="pkg-config intltool gobject-introspection" -makedepends="gtk+3-devel>=3.8 webkitgtk-devel gjs-devel - gtksourceview-devel>=3.8 clutter-gst-devel>=2.0.2 - clutter-gtk-devel>=1.4.4 evince-devel>=3.8 libmusicbrainz5-devel - libsoup-gnome-devel>=2.42" +makedepends="webkitgtk-devel>=2.1 gjs-devel>=1.38 + gtksourceview-devel>=3.10 clutter-gst-devel>=2.0.8_2 + clutter-gtk-devel>=1.4.4_2 evince-devel>=3.10 libmusicbrainz5-devel + libsoup-gnome-devel>=2.44" short_desc="A quick previewer for Nautilus" homepage="http://www.gnome.org" license="GPL-2" maintainer="Juan RP " -distfiles="${GNOME_SITE}/$pkgname/3.8/$pkgname-$version.tar.xz" -checksum=c4f24d0961ce8fc5ef3a4fe9af178e368c7117459df2c0be12c8f953646c82dd +distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" +checksum=cffcf28b170f5825e84983a979972d4d901a453b61cbe3e560d362e8dd4b4bc8 sushi_package() { pkg_install() { - vmove usr + vmove all } } From 571f4cf72347b448f8b49de3a2298cf0544468de Mon Sep 17 00:00:00 2001 From: Juan RP Date: Thu, 26 Sep 2013 21:41:20 +0200 Subject: [PATCH 089/159] mutter: update to 3.10.0.1. --- srcpkgs/mutter/template | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/srcpkgs/mutter/template b/srcpkgs/mutter/template index 1a213b9599c..cc2898d87ad 100644 --- a/srcpkgs/mutter/template +++ b/srcpkgs/mutter/template @@ -1,34 +1,36 @@ # Template file for 'mutter' pkgname=mutter -version=3.8.4 +version=3.10.0.1 revision=1 build_style=gnu-configure configure_args="--disable-schemas-compile --disable-static" hostmakedepends="pkg-config intltool gnome-doc-utils gobject-introspection" -makedepends="gtk+3-devel>=3.8 startup-notification-devel libcanberra-devel - clutter-devel>=1.14 gsettings-desktop-schemas-devel>=3.8 +makedepends="gtk+3-devel>=3.10 startup-notification-devel libcanberra-devel + clutter-devel>=1.16 gsettings-desktop-schemas-devel>=3.10 + upower-devel gnome-desktop-devel>=3.10 zenity>=3.8.0 libICE-devel libSM-devel desktop-file-utils" short_desc="Lightweight GTK+3 window manager" maintainer="Juan RP " homepage="http://www.gnome.org" license="GPL-2" -distfiles="${GNOME_SITE}/$pkgname/3.8/$pkgname-$version.tar.xz" -checksum=efe28bb665fd43d97b20c57bb1d1dc0a7e98919b6ad4b770bfd7ec5576e29454 +distfiles="${GNOME_SITE}/$pkgname/3.10/$pkgname-$version.tar.xz" +checksum=2d1288727d60b45c4d902101b805c89fa93f7a6b147bb4a7d3d99f990680b203 mutter-devel_package() { - depends="gsettings-desktop-schemas>=3.8.0 gtk+3-devel>=3.8 - clutter-devel>=1.14 libX11-devel mutter-${version}_${revision}" + depends="gsettings-desktop-schemas>=3.10 gtk+3-devel>=3.10 + clutter-devel>=1.16 libX11-devel mutter-${version}_${revision}" short_desc+=" - development files" pkg_install() { vmove usr/include vmove usr/lib/pkgconfig + vmove usr/share/gtk-doc vmove "usr/lib/mutter/*.gir" vmove "usr/lib/*.so" } } mutter_package() { - depends="zenity>=3.8.0 desktop-file-utils" + depends="zenity>=3.8 desktop-file-utils" pkg_install() { vmove all } From 817f5112f12c0c59a0d93a393e85b651ecc6a26f Mon Sep 17 00:00:00 2001 From: Juan RP Date: Thu, 26 Sep 2013 21:52:06 +0200 Subject: [PATCH 090/159] gnome-control-center: added a -devel pkg. --- srcpkgs/gnome-control-center/template | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/srcpkgs/gnome-control-center/template b/srcpkgs/gnome-control-center/template index 0653583c012..9e49642a287 100644 --- a/srcpkgs/gnome-control-center/template +++ b/srcpkgs/gnome-control-center/template @@ -1,7 +1,7 @@ # Template file for 'gnome-control-center' pkgname=gnome-control-center version=3.10.0 -revision=1 +revision=2 build_style=gnu-configure configure_args="--disable-static --with-cheese --with-libsocialweb" short_desc="The GNOME control center" @@ -26,6 +26,13 @@ makedepends="libXi-devel colord-devel>=0.1.3 libsocialweb-devel>=0.25.21 colord-gtk-devel>=0.1.24 accountsservice-devel vala-devel>=0.22 libXxf86misc-devel ModemManager-devel iso-codes" +gnome-control-center-devel_package() { + short_desc+=" - development files" + pkg_install() { + vmove usr/share/pkgconfig + } +} + gnome-control-center_package() { depends="libsocialweb>=0.25.21 gsettings-desktop-schemas>=3.10 From b5468fb30c25478ee8e6cf32c1bd74d93d5a9e3c Mon Sep 17 00:00:00 2001 From: Juan RP Date: Thu, 26 Sep 2013 21:58:21 +0200 Subject: [PATCH 091/159] gvfs: update to 1.18.1. --- srcpkgs/gvfs/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/gvfs/template b/srcpkgs/gvfs/template index 7aa06d2cd76..262b9a2f15d 100644 --- a/srcpkgs/gvfs/template +++ b/srcpkgs/gvfs/template @@ -1,6 +1,6 @@ # Template file for 'gvfs' pkgname=gvfs -version=1.18.0 +version=1.18.1 revision=1 build_style=gnu-configure configure_args="--disable-hal --disable-afc @@ -17,7 +17,7 @@ maintainer="Juan RP " homepage="http://www.gnome.org" license="LGPL-2.1" distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" -checksum=a6d9a547ac0621c405251fe929078b2700408cf94371d452f641413d56bd50db +checksum=92bc9ef0038be837fb74bfb65c5f3de46ee895e14dec65435d1c1da0adcc631f post_install() { cd ${DESTDIR}/usr/bin From 5b6bbd3fe848223e71508394a1e7ec2949982005 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Thu, 26 Sep 2013 22:29:00 +0200 Subject: [PATCH 092/159] folks: update to 0.9.5 (and forcefully bump soname mindeps). --- srcpkgs/folks/template | 31 ++++++++++++++++++++----------- 1 file changed, 20 insertions(+), 11 deletions(-) diff --git a/srcpkgs/folks/template b/srcpkgs/folks/template index 344b5ac9356..43b8d4f77aa 100644 --- a/srcpkgs/folks/template +++ b/srcpkgs/folks/template @@ -1,19 +1,21 @@ # Template file for 'folks' pkgname=folks -version=0.9.1 -revision=2 +version=0.9.5 +revision=1 build_style=gnu-configure -configure_args="--enable-vala --enable-tracker-backend" +configure_args="--disable-static --disable-fatal-warnings --enable-eds-backend + --enable-vala --enable-inspect-tool --enable-tracker-backend + --disable-libsocialweb-backend --disable-schemas-compile" hostmakedepends="pkg-config intltool which gobject-introspection" -makedepends="dbus-glib-devel telepathy-glib-devel>=0.19.9 libgee08-devel>=0.10 - libsocialweb-devel evolution-data-server-devel>=3.8.0 tracker-devel>=0.16 - libzeitgeist-devel" +# XXX needs zeitgeist >= 2.0 +makedepends="readline-devel vala-devel>=0.22 telepathy-glib-devel>=0.21 + libgee08-devel>=0.12 evolution-data-server-devel>=3.10 tracker-devel>=0.16_2" short_desc="GObject Library to aggregate people into metacontacts" maintainer="Juan RP " license="LGPL-2.1" homepage="http://telepathy.freedesktop.org/wiki/Folks" distfiles="${GNOME_SITE}/$pkgname/0.9/$pkgname-$version.tar.xz" -checksum=102b1867355d16e73a837871a058dda13c74fa385908ddda1623893ab0baee4a +checksum=924c440f16a8c9b0d0d832588fa77a1553fa2a5d2659c4c7d3178a7ef42222af long_desc=" libfolks is a library that aggregates people from multiple sources (eg, Telepathy connection managers and eventually evolution data server, Facebook, @@ -21,21 +23,28 @@ long_desc=" The initial goal is for GObject/C support, though the Vala bindings should basically automatic." +pre_build() { + export PKG_CONFIG_PATH="${wrksrc}/folks" +} + folks-devel_package() { - depends="telepathy-glib-devel>=0.19.9 libgee08-devel>=0.10 libsocialweb-devel - evolution-data-server-devel>=3.8.0 folks>=${version}" - short_desc="${short_desc} - development files" + depends="telepathy-glib-devel>=0.21 + libgee08-devel>=0.12 + evolution-data-server-devel>=3.10 + folks>=${version}" + short_desc+=" - development files" pkg_install() { vmove usr/include vmove usr/lib/pkgconfig vmove usr/share/gir-1.0 vmove usr/share/vala + vmove "usr/lib/*.so" } } folks_package() { depends="zeitgeist" pkg_install() { - vmove usr + vmove all } } From 3a9e0d4593c12752956c21f399ccbe8a6df500b0 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Thu, 26 Sep 2013 22:31:44 +0200 Subject: [PATCH 093/159] gnome-shell: update to 3.10.0.1. --- common/shlibs | 10 +- ...d-fix-asynchronous-management-of-bac.patch | 126 ------------------ srcpkgs/gnome-shell/template | 26 ++-- 3 files changed, 19 insertions(+), 143 deletions(-) delete mode 100644 srcpkgs/gnome-shell/patches/0001-Revert-background-fix-asynchronous-management-of-bac.patch diff --git a/common/shlibs b/common/shlibs index b57a1066403..ed5c11a36a4 100644 --- a/common/shlibs +++ b/common/shlibs @@ -738,11 +738,10 @@ libtelepathy-glib.so.0 telepathy-glib-0.15.5_1 libgedit-private.so.0 gedit-2.91.7_1 libaccountsservice.so.0 accountsservice-0.6.4_1 libgee.so.2 libgee-0.6.1_1 -libfolks.so.25 folks-0.6.3.2_1 -libfolks-telepathy.so.25 folks-0.6.3.2_1 -libfolks-libsocialweb.so.25 folks-0.6.3.2_1 -libfolks-eds.so.25 folks-0.6.3.2_1 -libfolks-tracker.so.25 folks-0.7.4.1_1 +libfolks.so.25 folks-0.9.5_1 +libfolks-telepathy.so.25 folks-0.9.5_1 +libfolks-eds.so.25 folks-0.9.5_1 +libfolks-tracker.so.25 folks-0.9.5_1 libnice.so.10 libnice-0.1.0_1 libgupnp-igd-1.0.so.4 gupnp-igd-0.2.0_1 libtelepathy-logger.so.2 telepathy-logger-0.2.12_1 @@ -1098,6 +1097,7 @@ libgnomekbd.so.8 libgnomekbd-3.6.0_1 libgnomekbdui.so.8 libgnomekbd-3.6.0_1 libibus-1.0.so.5 ibus-1.4.99.20120917_1 libgnome-bluetooth.so.11 gnome-bluetooth-3.6.0_1 +libgnome-bluetooth-applet.so.0 gnome-bluetooth-3.10.0_1 libxapian.so.22 libxapian-1.2.12_1 libzeitgeist-1.0.so.1 libzeitgeist-0.3.18_1 libcolord-gtk.so.1 colord-gtk-0.1.23_1 diff --git a/srcpkgs/gnome-shell/patches/0001-Revert-background-fix-asynchronous-management-of-bac.patch b/srcpkgs/gnome-shell/patches/0001-Revert-background-fix-asynchronous-management-of-bac.patch deleted file mode 100644 index 050feef5511..00000000000 --- a/srcpkgs/gnome-shell/patches/0001-Revert-background-fix-asynchronous-management-of-bac.patch +++ /dev/null @@ -1,126 +0,0 @@ -From 616e53679be1a412d5ce1add65f12c2129752fd4 Mon Sep 17 00:00:00 2001 -From: Adel Gadllah -Date: Thu, 15 Aug 2013 21:51:46 +0200 -Subject: [PATCH] Revert "background: fix asynchronous management of background - loading operations" - -This reverts commit 1020d8a0f8523a04d8336b1348388b8b242e414f. ---- - js/ui/background.js | 69 +++++++++++++++++++---------------------------------- - 1 file changed, 25 insertions(+), 44 deletions(-) - -diff --git a/js/ui/background.js b/js/ui/background.js -index 13343c6..1d9ab7c 100644 ---- js/ui/background.js -+++ js/ui/background.js -@@ -142,40 +142,33 @@ const BackgroundCache = new Lang.Class({ - cancellable: null, - onFinished: null }); - -- let fileLoad = { filename: params.filename, -- style: params.style, -- shouldCopy: false, -- monitorIndex: params.monitorIndex, -- effects: params.effects, -- onFinished: params.onFinished, -- cancellable: new Gio.Cancellable(), }; -- this._pendingFileLoads.push(fileLoad); -- -- if (params.cancellable) { -- params.cancellable.connect(Lang.bind(this, function(c) { -- fileLoad.cancellable.cancel(); -- })); -+ for (let i = 0; i < this._pendingFileLoads.length; i++) { -+ if (this._pendingFileLoads[i].filename == params.filename && -+ this._pendingFileLoads[i].style == params.style) { -+ this._pendingFileLoads[i].callers.push({ shouldCopy: true, -+ monitorIndex: params.monitorIndex, -+ effects: params.effects, -+ onFinished: params.onFinished }); -+ return; -+ } - } - -+ this._pendingFileLoads.push({ filename: params.filename, -+ style: params.style, -+ callers: [{ shouldCopy: false, -+ monitorIndex: params.monitorIndex, -+ effects: params.effects, -+ onFinished: params.onFinished }] }); -+ - let content = new Meta.Background({ meta_screen: global.screen, - monitor: params.monitorIndex, - effects: params.effects }); - - content.load_file_async(params.filename, - params.style, -- fileLoad.cancellable, -+ params.cancellable, - Lang.bind(this, - function(object, result) { -- if (fileLoad.cancellable.is_cancelled()) { -- if (params.cancellable && params.cancellable.is_cancelled()) { -- if (params.onFinished) -- params.onFinished(null); -- this._removePendingFileLoad(fileLoad); -- return; -- } -- return; -- } -- - try { - content.load_file_finish(result); - -@@ -185,25 +178,22 @@ const BackgroundCache = new Lang.Class({ - content = null; - } - -- let needsCopy = false; - for (let i = 0; i < this._pendingFileLoads.length; i++) { - let pendingLoad = this._pendingFileLoads[i]; - if (pendingLoad.filename != params.filename || - pendingLoad.style != params.style) - continue; - -- if (pendingLoad.cancellable.is_cancelled()) -- continue; -+ for (let j = 0; j < pendingLoad.callers.length; j++) { -+ if (pendingLoad.callers[j].onFinished) { -+ if (content && pendingLoad.callers[j].shouldCopy) { -+ content = object.copy(pendingLoad.callers[j].monitorIndex, -+ pendingLoad.callers[j].effects); - -- pendingLoad.cancellable.cancel(); -- if (pendingLoad.onFinished) { -- if (content && needsCopy) { -- content = object.copy(pendingLoad.monitorIndex, -- pendingLoad.effects); -- } -+ } - -- needsCopy = true; -- pendingLoad.onFinished(content); -+ pendingLoad.callers[j].onFinished(content); -+ } - } - - this._pendingFileLoads.splice(i, 1); -@@ -211,15 +201,6 @@ const BackgroundCache = new Lang.Class({ - })); - }, - -- _removePendingFileLoad: function(fileLoad) { -- for (let i = 0; i < this._pendingFileLoads.length; i++) { -- if (this._pendingFileLoads[i].cancellable == fileLoad.cancellable) { -- this._pendingFileLoads.splice(i, 1); -- break; -- } -- } -- }, -- - getImageContent: function(params) { - params = Params.parse(params, { monitorIndex: 0, - style: null, --- -1.8.3.1 - diff --git a/srcpkgs/gnome-shell/template b/srcpkgs/gnome-shell/template index e7fa18a1ea1..eda6667d790 100644 --- a/srcpkgs/gnome-shell/template +++ b/srcpkgs/gnome-shell/template @@ -1,30 +1,32 @@ # Template file for 'gnome-shell' pkgname=gnome-shell -version=3.8.4 -revision=2 +version=3.10.0.1 +revision=1 build_style=gnu-configure configure_args="--disable-schemas-compile --with-systemd" hostmakedepends="pkg-config intltool gnome-doc-utils gobject-introspection" -makedepends="json-glib-devel>=0.14.0 startup-notification-devel network-manager-applet-devel - folks-devel gnome-menus-devel>=3.8 gnome-desktop-devel>=3.8 - clutter-devel>=1.14 gnome-bluetooth-devel>=3.8 mutter-devel>=${version} - gjs-devel telepathy-logger-devel libcanberra-devel polkit-devel libcroco-devel - pulseaudio-devel libgudev-devel gst-plugins-base1-devel systemd-devel - caribou-devel>=0.4.10_2 gir-freedesktop gnome-control-center>=3.8" +makedepends=" + evolution-data-server>=3.10 gnome-desktop-devel>=3.10 + json-glib-devel>=0.16.2 startup-notification-devel network-manager-applet-devel + clutter-devel>=1.16 gnome-bluetooth-devel>=3.10 mutter-devel>=${version} + gjs-devel>=1.38 telepathy-logger-devel libcanberra-devel polkit-devel libcroco-devel + pulseaudio-devel libgudev-devel gst-plugins-base1-devel>=1:1.2 systemd-devel + caribou-devel>=0.4.12 gir-freedesktop gnome-control-center-devel>=3.10 + folks-devel>=0.9.5 gnome-menus-devel>=3.8" short_desc="GNOME core user interface" maintainer="Juan RP " homepage="http://live.gnome.org/GnomeShell" license="GPL-2" -distfiles="${GNOME_SITE}/$pkgname/3.8/$pkgname-$version.tar.xz" -checksum=547e571c67b1436a32715b016ee63c666afcafed9c5a2f76dc4ad3bcaebffa47 +distfiles="${GNOME_SITE}/$pkgname/3.10/$pkgname-$version.tar.xz" +checksum=eb98ca6274e82e446834221b2dfd9af0e12e5ebce651319435524fd6cd5f4ec9 post_install() { rm -rf ${DESTDIR}/usr/share/gtk-doc } gnome-shell_package() { - depends="caribou>=0.4.10 pulseaudio mesa-demos desktop-file-utils - gir-freedesktop gnome-control-center>=3.8 mutter>=${version}" + depends="caribou>=0.4.12 pulseaudio mesa-demos desktop-file-utils + gir-freedesktop gnome-control-center>=3.10 mutter>=${version}" pkg_install() { vmove all } From c504b2162b67bf011982936ab1798227c6a29a6d Mon Sep 17 00:00:00 2001 From: Juan RP Date: Thu, 26 Sep 2013 22:33:40 +0200 Subject: [PATCH 094/159] gnome-contacts: update to 3.10.0. --- srcpkgs/gnome-contacts/template | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/srcpkgs/gnome-contacts/template b/srcpkgs/gnome-contacts/template index 4a14716b846..921cf790dd8 100644 --- a/srcpkgs/gnome-contacts/template +++ b/srcpkgs/gnome-contacts/template @@ -1,18 +1,18 @@ # Template file for 'gnome-contacts' pkgname=gnome-contacts -version=3.8.3 +version=3.10 revision=1 build_style=gnu-configure hostmakedepends="pkg-config intltool gobject-introspection" -makedepends="vala-devel>=0.20 telepathy-glib-devel>=0.19.9 - gnome-desktop-devel>=3.8.0 folks-devel>=0.9 libnotify-devel - cheese-devel>=3.8.0" +makedepends="vala-devel>=0.22 telepathy-glib-devel>=0.21 + gnome-desktop-devel>=3.10 folks-devel>=0.9.5 libnotify-devel + cheese-devel>=3.10" short_desc="GNOME contacts manager" maintainer="Juan RP " homepage="http://www.gnome.org" license="GPL-2" -distfiles="${GNOME_SITE}/$pkgname/3.8/$pkgname-$version.tar.xz" -checksum=48e179aa40ffdee4218565a22da31d8794fb47f21beda60a2e8b80483a2f80a3 +distfiles="${GNOME_SITE}/$pkgname/${version}/$pkgname-$version.tar.xz" +checksum=1cb57d81455ee44e50745452bfefdf74f9ad4e393661199005c665284cda20cf gnome-contacts_package() { depends="desktop-file-utils" From 371e9162004249052bd61838608b80e3b5324fb7 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Thu, 26 Sep 2013 22:43:20 +0200 Subject: [PATCH 095/159] libchamplain: rebuild against cogl/clutter 1.16. --- srcpkgs/libchamplain/template | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/srcpkgs/libchamplain/template b/srcpkgs/libchamplain/template index a45e06290b2..699ee9247db 100644 --- a/srcpkgs/libchamplain/template +++ b/srcpkgs/libchamplain/template @@ -1,12 +1,12 @@ # Template file for 'libchamplain' pkgname=libchamplain version=0.12.5 -revision=1 +revision=2 build_style=gnu-configure configure_args="--disable-debug --disable-static" hostmakedepends="pkg-config intltool gobject-introspection" -makedepends="libsoup-gnome-devel gtk+3-devel>=3.8 cogl-devel>=1.14 - clutter-gtk-devel>=1.4.4 sqlite-devel" +makedepends="libsoup-gnome-devel>=2.44 gtk+3-devel>=3.8 cogl-devel>=1.16 + clutter-gtk-devel>=1.4.4_2 sqlite-devel" short_desc="Library aimed to provide a Clutter widget to display rasterized maps" maintainer="Juan RP " homepage="http://projects.gnome.org/libchamplain/" @@ -15,8 +15,12 @@ distfiles="${GNOME_SITE}/$pkgname/0.12/$pkgname-$version.tar.xz" checksum=9c937d3775053a7d6b542aad36b16bbb07e02be3adb683ae57d7dcbe89634236 libchamplain-devel_package() { - depends="libsoup-gnome-devel gtk+3-devel>=3.8 clutter-gtk-devel>=1.4.4 - json-glib-devel sqlite-devel libchamplain>=$version" + depends="libsoup-gnome-devel>=2.44 + gtk+3-devel>=3.8 + clutter-gtk-devel>=1.4.4_2 + json-glib-devel>=0.16.2 + sqlite-devel + libchamplain>=$version" short_desc+=" - development files" pkg_install() { vmove usr/include From 086ea527743979267a7721f4b7c13389c8880904 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Thu, 26 Sep 2013 22:46:25 +0200 Subject: [PATCH 096/159] empathy: update to 3.10.0. --- common/shlibs | 4 ++-- srcpkgs/empathy/template | 22 +++++++++++----------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/common/shlibs b/common/shlibs index ed5c11a36a4..8b22f393a2a 100644 --- a/common/shlibs +++ b/common/shlibs @@ -748,8 +748,8 @@ libtelepathy-logger.so.2 telepathy-logger-0.2.12_1 libtelepathy-logger.so.3 telepathy-logger-0.6.0_1 libmission-control-plugins.so.0 telepathy-mission-control-5.9.2_1 libclutter-gtk-1.0.so.0 clutter-gtk-1.1.2_1 -libchamplain-0.12.so.0 libchamplain-0.12.2_1_1 -libchamplain-gtk-0.12.so.0 libchamplain-0.12.2_1_1 +libchamplain-0.12.so.0 libchamplain-0.12.5_2 +libchamplain-gtk-0.12.so.0 libchamplain-0.12.5_2 libgeoclue.so.0 geoclue-0.12.0_1 libvpx.so.1 libvpx-1.0.0_1 libXevie.so.1 libXevie-1.0.2_1 diff --git a/srcpkgs/empathy/template b/srcpkgs/empathy/template index f67a96e707c..fb03cf47897 100644 --- a/srcpkgs/empathy/template +++ b/srcpkgs/empathy/template @@ -1,28 +1,28 @@ # Template file for 'empathy' pkgname=empathy -version=3.8.4 +version=3.10.0 revision=1 build_style=gnu-configure configure_args="--enable-gst-1.0=yes --disable-schemas-compile --disable-static" hostmakedepends="pkg-config intltool gnome-doc-utils itstool gobject-introspection" -makedepends="telepathy-glib-devel>=0.19.9 telepathy-logger-devel>=0.8 +makedepends=" + libcanberra-devel clutter-gst-devel>=2.0.8_2 clutter-gtk-devel>=1.4.4_2 + telepathy-glib-devel>=0.19.9 telepathy-logger-devel>=0.8 libnotify-devel telepathy-farstream-devel>=0.6.0 telepathy-mission-control-devel>=5.14 - evolution-data-server-devel>=3.6.0 geoclue-devel folks-devel>=0.9.1 - libcanberra-devel libnotify-devel clutter-gtk-devel>=1.4.4 - clutter-gst-devel>=2.0.2 webkitgtk-devel libgudev-devel pulseaudio-devel - cheese-devel>=3.8 enchant-devel NetworkManager-devel - libchamplain-devel>=0.12.3_3 gnutls-devel>=3.1.5 - gsettings-desktop-schemas-devel>=3.6.0 iso-codes" + evolution-data-server-devel>=3.10 geocode-glib-devel folks-devel>=0.9.5 + webkitgtk-devel>=2.1 libgudev-devel pulseaudio-devel cheese-devel>=3.10 + enchant-devel NetworkManager-devel libchamplain-devel>=0.12.5_2 + gnutls-devel>=3.1.5 gsettings-desktop-schemas-devel>=3.10 geoclue2 iso-codes" short_desc="GNOME instant messaging client using the Telepathy framework" maintainer="Juan RP " homepage="http://live.gnome.org/Empathy" license="GPL-2" -distfiles="${GNOME_SITE}/$pkgname/3.8/$pkgname-$version.tar.xz" -checksum=cbc4934ce838e3d697616b5c36b070d2fc4fc57f84fd654c2f2cb2b8b650f5c9 +distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" +checksum=5580bdba9faec0518b3328d5dc23f03dc0cf25ccf6c14902f306838c23d5918f empathy_package() { - depends="gsettings-desktop-schemas>=3.8 iso-codes" + depends="gsettings-desktop-schemas>=3.10 geoclue2 iso-codes" pkg_install() { vmove all } From 90bca4f3017f8e53c052b879d2bbdec024a27288 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Thu, 26 Sep 2013 22:48:08 +0200 Subject: [PATCH 097/159] brasero: rebuild against gnome-3.10. --- srcpkgs/brasero/template | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/srcpkgs/brasero/template b/srcpkgs/brasero/template index edf39585a3b..3433bae9b14 100644 --- a/srcpkgs/brasero/template +++ b/srcpkgs/brasero/template @@ -1,13 +1,13 @@ # Template file for 'brasero' pkgname=brasero version=3.8.0 -revision=2 +revision=3 build_style=gnu-configure configure_args="--disable-schemas-compile --disable-caches" hostmakedepends="pkg-config intltool which gnome-doc-utils itstool gobject-introspection" -makedepends="gst-plugins-base1-devel totem-pl-parser-devel libnotify-devel - libcanberra-devel nautilus-devel>=3.8 tracker-devel>=0.16 libisofs-devel +makedepends="gst-plugins-base1-devel totem-pl-parser-devel>=3.10 libnotify-devel + libcanberra-devel nautilus-devel>=3.10 tracker-devel>=0.16_2 libisofs-devel libburn-devel libSM-devel" short_desc="Application to burn CD/DVD for the Gnome Desktop" maintainer="Juan RP " @@ -29,7 +29,7 @@ long_desc=" brasero-devel_package() { depends="gtk+3-devel brasero>=${version}" - short_desc="${short_desc} - development files" + short_desc+=" - development files" pkg_install() { vmove usr/include vmove usr/lib/pkgconfig @@ -39,8 +39,8 @@ brasero-devel_package() { } brasero_package() { - depends="cdrtools dconf>=0 shared-mime-info hicolor-icon-theme desktop-file-utils" + depends="cdrtools dconf shared-mime-info hicolor-icon-theme desktop-file-utils" pkg_install() { - vmove usr + vmove all } } From 9a728142ab8919fa81856f00df61736542993da2 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Thu, 26 Sep 2013 22:51:00 +0200 Subject: [PATCH 098/159] rhythmbox: rebuild against gnome 3.10. --- srcpkgs/rhythmbox/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/rhythmbox/template b/srcpkgs/rhythmbox/template index 5727965617b..0f90ef0cb34 100644 --- a/srcpkgs/rhythmbox/template +++ b/srcpkgs/rhythmbox/template @@ -1,17 +1,17 @@ # Template file for 'rhythmbox'. pkgname=rhythmbox version=3.0 -revision=1 +revision=2 build_style=gnu-configure configure_args="--disable-static --disable-schemas-compile --with-webkit --with-gudev --without-hal --enable-vala" hostmakedepends="which pkg-config intltool gnome-doc-utils itstool gobject-introspection" -makedepends="gtk+3-devel totem-pl-parser-devel libsoup-gnome-devel +makedepends="gtk+3-devel totem-pl-parser-devel>=3.10 libsoup-gnome-devel json-glib-devel libgudev-devel GConf-devel libdiscid-devel vala-devel>=0.20 - libmtp-devel>=1.1.4 avahi-glib-libs-devel libpeas-devel brasero-devel + libmtp-devel>=1.1.4 avahi-glib-libs-devel libpeas-devel brasero-devel>=3.8.0_3 libnotify-devel tdb-devel>=1.2.6 libsecret-devel pygobject-devel - gst-plugins-base1-devel webkitgtk-devel grilo-devel clutter-gtk-devel + gst-plugins-base1-devel webkitgtk-devel>=2.1 grilo-devel clutter-gtk-devel>=1.4.4_2 python3-devel pygobject-devel libdmapsharing-devel>=2.9.17 desktop-file-utils hicolor-icon-theme" short_desc="GNOME integrated music management application, inspired by Apple's iTunes" From 99cba6a09bdd1f9838af053dd517967f16178879 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Thu, 26 Sep 2013 22:52:36 +0200 Subject: [PATCH 099/159] rhythmbox: remove unused build-dep. --- srcpkgs/rhythmbox/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/rhythmbox/template b/srcpkgs/rhythmbox/template index 0f90ef0cb34..a299c38e766 100644 --- a/srcpkgs/rhythmbox/template +++ b/srcpkgs/rhythmbox/template @@ -7,7 +7,7 @@ configure_args="--disable-static --disable-schemas-compile --with-webkit --with-gudev --without-hal --enable-vala" hostmakedepends="which pkg-config intltool gnome-doc-utils itstool gobject-introspection" -makedepends="gtk+3-devel totem-pl-parser-devel>=3.10 libsoup-gnome-devel +makedepends="gtk+3-devel totem-pl-parser-devel>=3.10 json-glib-devel libgudev-devel GConf-devel libdiscid-devel vala-devel>=0.20 libmtp-devel>=1.1.4 avahi-glib-libs-devel libpeas-devel brasero-devel>=3.8.0_3 libnotify-devel tdb-devel>=1.2.6 libsecret-devel pygobject-devel From adefd96841b82e4513021c54edc2e6870c70841c Mon Sep 17 00:00:00 2001 From: Juan RP Date: Thu, 26 Sep 2013 22:53:46 +0200 Subject: [PATCH 100/159] rhythmbox: remove another unused build-dep. --- srcpkgs/rhythmbox/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/rhythmbox/template b/srcpkgs/rhythmbox/template index a299c38e766..a07238c6558 100644 --- a/srcpkgs/rhythmbox/template +++ b/srcpkgs/rhythmbox/template @@ -11,7 +11,7 @@ makedepends="gtk+3-devel totem-pl-parser-devel>=3.10 json-glib-devel libgudev-devel GConf-devel libdiscid-devel vala-devel>=0.20 libmtp-devel>=1.1.4 avahi-glib-libs-devel libpeas-devel brasero-devel>=3.8.0_3 libnotify-devel tdb-devel>=1.2.6 libsecret-devel pygobject-devel - gst-plugins-base1-devel webkitgtk-devel>=2.1 grilo-devel clutter-gtk-devel>=1.4.4_2 + webkitgtk-devel>=2.1 grilo-devel clutter-gtk-devel>=1.4.4_2 python3-devel pygobject-devel libdmapsharing-devel>=2.9.17 desktop-file-utils hicolor-icon-theme" short_desc="GNOME integrated music management application, inspired by Apple's iTunes" From 53f966d95a249ef83e5e626cd51adc1e724d0e26 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Thu, 26 Sep 2013 22:55:31 +0200 Subject: [PATCH 101/159] rhythmbox: re-add libsoup-gnome, sigh. --- srcpkgs/rhythmbox/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/rhythmbox/template b/srcpkgs/rhythmbox/template index a07238c6558..948fc37b6dc 100644 --- a/srcpkgs/rhythmbox/template +++ b/srcpkgs/rhythmbox/template @@ -7,7 +7,7 @@ configure_args="--disable-static --disable-schemas-compile --with-webkit --with-gudev --without-hal --enable-vala" hostmakedepends="which pkg-config intltool gnome-doc-utils itstool gobject-introspection" -makedepends="gtk+3-devel totem-pl-parser-devel>=3.10 +makedepends="gtk+3-devel libsoup-gnome-devel>=2.44 totem-pl-parser-devel>=3.10 json-glib-devel libgudev-devel GConf-devel libdiscid-devel vala-devel>=0.20 libmtp-devel>=1.1.4 avahi-glib-libs-devel libpeas-devel brasero-devel>=3.8.0_3 libnotify-devel tdb-devel>=1.2.6 libsecret-devel pygobject-devel From 5f9fe6a2b2a1a6e75b3b7f04001062acbd1dea48 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Thu, 26 Sep 2013 22:56:06 +0200 Subject: [PATCH 102/159] rhythmbox: re-add gst-plugins-base1, sigh. --- srcpkgs/rhythmbox/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/rhythmbox/template b/srcpkgs/rhythmbox/template index 948fc37b6dc..1f67d4e3d8f 100644 --- a/srcpkgs/rhythmbox/template +++ b/srcpkgs/rhythmbox/template @@ -11,7 +11,7 @@ makedepends="gtk+3-devel libsoup-gnome-devel>=2.44 totem-pl-parser-devel>=3.10 json-glib-devel libgudev-devel GConf-devel libdiscid-devel vala-devel>=0.20 libmtp-devel>=1.1.4 avahi-glib-libs-devel libpeas-devel brasero-devel>=3.8.0_3 libnotify-devel tdb-devel>=1.2.6 libsecret-devel pygobject-devel - webkitgtk-devel>=2.1 grilo-devel clutter-gtk-devel>=1.4.4_2 + webkitgtk-devel>=2.1 grilo-devel gst-plugins-base1-devel>=1:1.2 clutter-gtk-devel>=1.4.4_2 python3-devel pygobject-devel libdmapsharing-devel>=2.9.17 desktop-file-utils hicolor-icon-theme" short_desc="GNOME integrated music management application, inspired by Apple's iTunes" From fa92251394fbf59b086edfeb9c6d06b13a77381e Mon Sep 17 00:00:00 2001 From: Juan RP Date: Thu, 26 Sep 2013 23:00:47 +0200 Subject: [PATCH 103/159] devhelp: update to 3.10.0. --- srcpkgs/devhelp/template | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/srcpkgs/devhelp/template b/srcpkgs/devhelp/template index 1cf36ceeccf..66a2713ea6c 100644 --- a/srcpkgs/devhelp/template +++ b/srcpkgs/devhelp/template @@ -1,16 +1,16 @@ # Template file for 'devhelp' pkgname=devhelp -version=3.8.2 -revision=2 +version=3.10.0 +revision=1 build_style=gnu-configure hostmakedepends="pkg-config intltool" -makedepends="glib-devel gtk+3-devel webkitgtk-devel" +makedepends="webkitgtk-devel>=2.1" short_desc="API documentation browser for GTK+ and GNOME" maintainer="davehome " license="GPL-2" homepage="https://wiki.gnome.org/devhelp" -distfiles="${GNOME_SITE}/${pkgname}/3.8/${pkgname}-${version}.tar.xz" -checksum=a245b53824c6f2ff89245ff807bb2140bde74951ea6f1d759a0fd0c6959ca9f7 +distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" +checksum=4d28d21a0331c67086607b737147947b288416ab38c8a0b0264f7a63bd4fce9b long_desc=" Devhelp is an API documentation browser for GTK+ and GNOME. It works natively with gtk-doc (the API reference framework developed for GTK+ and used @@ -18,8 +18,8 @@ long_desc=" you can use Devhelp to browse the documentation." devhelp-devel_package() { - short_desc+=" (Development files)" - depends="gtk+3-devel webkitgtk-devel devhelp-libs-${version}_${revision}" + short_desc+=" - Development files" + depends="webkitgtk-devel>=2.1 devhelp-libs-${version}_${revision}" pkg_install() { vmove usr/include vmove usr/lib/pkgconfig @@ -28,14 +28,14 @@ devhelp-devel_package() { } devhelp-libs_package() { - short_desc+=" (Runtime library)" + short_desc+=" - Runtime library" pkg_install() { vmove "usr/lib/libdevhelp*.so.*" } } devhelp-gedit-plugin_package() { - short_desc+=" (gedit plugin)" + short_desc+=" - gedit plugin" depends="devhelp gedit python" pkg_install() { vmove usr/lib/gedit @@ -44,6 +44,6 @@ devhelp-gedit-plugin_package() { devhelp_package() { pkg_install() { - vmove usr + vmove all } } From 805580b7b005640ecbb1799e4eda039f8181edfc Mon Sep 17 00:00:00 2001 From: Juan RP Date: Thu, 26 Sep 2013 23:02:19 +0200 Subject: [PATCH 104/159] gnome-shell-extensions: update to 3.10.0. --- srcpkgs/gnome-shell-extensions/template | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/srcpkgs/gnome-shell-extensions/template b/srcpkgs/gnome-shell-extensions/template index 636c28afca2..95d58da95a9 100644 --- a/srcpkgs/gnome-shell-extensions/template +++ b/srcpkgs/gnome-shell-extensions/template @@ -1,22 +1,22 @@ # Template file for 'gnome-shell-extensions' pkgname=gnome-shell-extensions -version=3.8.4 +version=3.10.0 revision=1 build_style=gnu-configure configure_args="--enable-extensions=all" -hostmakedepends="pkg-config intltool" -makedepends="unzip libglib-devel libgtop-devel nautilus>=3.8 - gnome-shell>=${version} gnome-desktop-devel>=3.8" +hostmakedepends="pkg-config intltool unzip" +makedepends="libglib-devel libgtop-devel nautilus>=3.10 + gnome-shell>=${version} gnome-desktop-devel>=3.10" short_desc="Extensions for GNOME shell, including classic mode" maintainer="Juan RP " homepage="http://live.gnome.org/GnomeShell/Extensions" license="GPL-2" -distfiles="${GNOME_SITE}/$pkgname/3.8/$pkgname-$version.tar.xz" -checksum=acbf582837c2bc4063ac39c1273ff5d86a355ccf81515573119594288702f37e +distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" +checksum=8b56db464530da3cb9450177346874aaa07b14d1d4233d5f620aa3a2fc779595 gnome-shell-extensions_package() { noarch="yes" - depends="gnome-shell>=${version} nautilus>=3.8 unzip" + depends="gnome-shell>=${version} nautilus>=3.10 unzip" pkg_install() { vmove all } From 1572185ad5035cc6e6f8beee6472aac77465ffbf Mon Sep 17 00:00:00 2001 From: Juan RP Date: Thu, 26 Sep 2013 23:06:28 +0200 Subject: [PATCH 105/159] gnome-shell-extensions: remove redundant build-deps. --- srcpkgs/gnome-shell-extensions/template | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/srcpkgs/gnome-shell-extensions/template b/srcpkgs/gnome-shell-extensions/template index 95d58da95a9..92e094ccdc0 100644 --- a/srcpkgs/gnome-shell-extensions/template +++ b/srcpkgs/gnome-shell-extensions/template @@ -4,9 +4,8 @@ version=3.10.0 revision=1 build_style=gnu-configure configure_args="--enable-extensions=all" -hostmakedepends="pkg-config intltool unzip" -makedepends="libglib-devel libgtop-devel nautilus>=3.10 - gnome-shell>=${version} gnome-desktop-devel>=3.10" +hostmakedepends="pkg-config intltool" +makedepends="unzip libglib-devel libgtop-devel" short_desc="Extensions for GNOME shell, including classic mode" maintainer="Juan RP " homepage="http://live.gnome.org/GnomeShell/Extensions" From 1062c463389e37ff9c65728876d15f27cdea6cd6 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Thu, 26 Sep 2013 23:15:46 +0200 Subject: [PATCH 106/159] evolution: update to 3.10.0. --- srcpkgs/evolution/template | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/srcpkgs/evolution/template b/srcpkgs/evolution/template index 83ecd35226b..362e28bbc65 100644 --- a/srcpkgs/evolution/template +++ b/srcpkgs/evolution/template @@ -1,6 +1,6 @@ # Template file for 'evolution' pkgname=evolution -version=3.8.5 +version=3.10.0 revision=1 build_style=gnu-configure configure_args="--disable-pst-import --with-openldap --disable-bogofilter @@ -8,17 +8,17 @@ configure_args="--disable-pst-import --with-openldap --disable-bogofilter --disable-text-highlight" hostmakedepends="which pkg-config intltool itstool gnome-doc-utils gobject-introspection" -makedepends="libgdata-devel>=0.13 webkitgtk-devel evolution-data-server-devel>=3.8 - GConf-devel clutter-gtk-devel>=1.4.4 libcanberra-devel - gtkhtml-devel>=4.6.0 libsoup-gnome-devel gnome-desktop-devel>=3.8 - libnotify-devel gstreamer1-devel libgweather-devel>=3.8 +makedepends="libgdata-devel>=0.14 webkitgtk-devel>=2.1 evolution-data-server-devel>=3.10 + GConf-devel clutter-gtk-devel>=1.4.4_2 libcanberra-devel + gtkhtml-devel>=4.6.0 libsoup-gnome-devel>=2.44 gnome-desktop-devel>=3.10 + libnotify-devel gstreamer1-devel>=1:1.2 libgweather-devel>=3.10 NetworkManager-devel enchant-devel iso-codes" short_desc="Integrated mail, addressbook and calendaring for GNOME" maintainer="davehome " license="GPL-2" homepage="http://www.gnome.org" -distfiles="${GNOME_SITE}/$pkgname/3.8/$pkgname-$version.tar.xz" -checksum=26ef047425826a7672f0db7f3d4eef908e68bae47a9e0756883079c445e4326d +distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" +checksum=e64fabc07e1126b80ef8354411d8232aee6e45cfece040a99d494d77df040064 post_install() { # Remove devel stuff, not interested. From 3c0ba1c6588d949a45285ff090e28e5cd69c6bad Mon Sep 17 00:00:00 2001 From: Juan RP Date: Thu, 26 Sep 2013 23:19:03 +0200 Subject: [PATCH 107/159] file-roller: update to 3.10.0. --- srcpkgs/file-roller/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/file-roller/template b/srcpkgs/file-roller/template index 719b7883df1..9c60e2e2f81 100644 --- a/srcpkgs/file-roller/template +++ b/srcpkgs/file-roller/template @@ -1,17 +1,17 @@ # Template file for 'file-roller' pkgname=file-roller -version=3.8.4 +version=3.10.0 revision=1 build_style=gnu-configure configure_args="--disable-schemas-compile --enable-magic --disable-static" hostmakedepends="which pkg-config intltool gnome-doc-utils itstool" -makedepends="nautilus-devel>=3.8 json-glib-devel libnotify-devel libarchive-devel>=3.1.2" +makedepends="nautilus-devel>=3.10 json-glib-devel libnotify-devel libarchive-devel>=3.1.2" short_desc="GNOME Front-end to archiving programs like tar and zip" maintainer="Juan RP " homepage="http://www.gnome.org" license="GPL-2" -distfiles="${GNOME_SITE}/$pkgname/3.8/$pkgname-$version.tar.xz" -checksum=3615bc41bbe28030d16ee414a8f5f9a3e37f745733c39032ef1559a06be3eea8 +distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" +checksum=d889bb9904146e5715c082aa9a6d96b0606a066ba2bf05fbfb7030f2bf274f13 file-roller_package() { depends="desktop-file-utils hicolor-icon-theme" From 4e1a8eb65307329160a16217a0cf6235a5bd33fa Mon Sep 17 00:00:00 2001 From: Juan RP Date: Thu, 26 Sep 2013 23:21:59 +0200 Subject: [PATCH 108/159] gedit: update to 3.10.0. --- srcpkgs/gedit/template | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/srcpkgs/gedit/template b/srcpkgs/gedit/template index 30b395f6b20..ae2c0e44651 100644 --- a/srcpkgs/gedit/template +++ b/srcpkgs/gedit/template @@ -1,23 +1,24 @@ # Template file for 'gedit' pkgname=gedit -version=3.8.3 +version=3.10.0 revision=1 +# XXX python and zeitgeist plugins. build_style=gnu-configure configure_args="--disable-schemas-compile --disable-updater --enable-python=no --enable-gvfs-metadata" hostmakedepends="pkg-config intltool itstool gnome-doc-utils gobject-introspection python3" -makedepends="gtksourceview-devel>=3.8 libpeas-devel>=1.8 enchant-devel - gsettings-desktop-schemas-devel>=3.8 libzeitgeist-devel iso-codes" +makedepends="gtksourceview-devel>=3.10 libpeas-devel>=1.9 enchant-devel + gsettings-desktop-schemas-devel>=3.10 iso-codes" short_desc="A text editor for GNOME" maintainer="Juan RP " homepage="http://www.gnome.org" license="GPL-2" -distfiles="${GNOME_SITE}/gedit/3.8/gedit-$version.tar.xz" -checksum=dfbc2d9cf975b247c6a6b8bd1ae1b72d8e8a1f862f5f3d084a404853092cf9d3 +distfiles="${GNOME_SITE}/gedit/${version%.*}/gedit-$version.tar.xz" +checksum=4c20049ccee2198468edaf20fba9dbd44e3baf50bd304700b4f24257571cdca5 gedit-devel_package() { - depends="gtksourceview-devel>=3.8 libpeas-devel>=1.8" + depends="gtksourceview-devel>=3.10 libpeas-devel>=1.9" short_desc+=" - development files" pkg_install() { vmove usr/include From 28255eeeb25bf069524c49bade25d1c281da28ef Mon Sep 17 00:00:00 2001 From: Juan RP Date: Thu, 26 Sep 2013 23:27:25 +0200 Subject: [PATCH 109/159] glade3: update to 3.16.0 (soname bump). --- common/shlibs | 3 +-- srcpkgs/glade3/template | 27 +++++++++++---------------- 2 files changed, 12 insertions(+), 18 deletions(-) diff --git a/common/shlibs b/common/shlibs index 8b22f393a2a..112e1a057b6 100644 --- a/common/shlibs +++ b/common/shlibs @@ -661,8 +661,7 @@ liborc-test-0.4.so.0 orc-0.4.11_1 libgmime-2.6.so.0 gmime-2.6.4_1 libtotem-plparser.so.18 totem-pl-parser-3.10.0_1 libtotem-plparser-mini.so.18 totem-pl-parser-3.10.0_1 -libgladeui-2.so.0 libgladeui3-3.10.0_1 -libgladeui-2.so.4 libgladeui3-3.14.1_1 +libgladeui-2.so.6 libgladeui3-3.10.0_1 libgstvdp-0.10.so.0 gst-plugins-bad-0.10.20_1 libgstphotography-0.10.so.0 gst-plugins-bad-0.10.20_1 libgstbasevideo-0.10.so.0 gst-plugins-bad-0.10.20_1 diff --git a/srcpkgs/glade3/template b/srcpkgs/glade3/template index e3f6036ded5..561dfad35fd 100644 --- a/srcpkgs/glade3/template +++ b/srcpkgs/glade3/template @@ -1,18 +1,18 @@ # Template build file for 'glade3'. pkgname=glade3 -version=3.14.1 +version=3.16.0 wrksrc=glade-${version} -revision=3 +revision=1 build_style=gnu-configure configure_args="--disable-static" -makedepends="which pkg-config intltool gnome-doc-utils itstool gtk+3-devel - libxml2-devel gobject-introspection python-devel pygobject-devel" -short_desc="An User Interface Designer for GTK+" +hostmakedepends="which pkg-config intltool gnome-doc-utils itstool gobject-introspection" +makedepends="gtk+3-devel libxml2-devel python-devel pygobject-devel" +short_desc="An User Interface Designer for GTK+3" homepage="http://glade.gnome.org/" license="GPL-2" maintainer="Juan RP " -distfiles="${GNOME_SITE}/glade/3.14/glade-$version.tar.xz" -checksum=8484b62c7a4579ea3e5d98200b397a1baf0b621c0b0c70242ee1dbbe449eae20 +distfiles="${GNOME_SITE}/glade/${version%.*}/glade-$version.tar.xz" +checksum=b80773a294d3af07739d9d53bae12e11cf0bbf420bbc8931cc5e20b2647e3626 long_desc=" Glade is a RAD tool to enable quick & easy development of user interfaces for the GTK+ toolkit and the GNOME desktop environment. @@ -28,31 +28,26 @@ libgladeui3_package() { depends="pygobject" short_desc="GTK+ User Interface Build core library" pkg_install() { - vmove "usr/lib/*.so*" - vmove usr/lib/glade + vmove "usr/lib/*.so.*" vmove usr/lib/girepository-1.0 } } glade3-devel_package() { depends="gtk+3-devel libxml2-devel libgladeui3-${version}_${revision}" - short_desc="${short_desc} - development files" + short_desc+=" - development files" pkg_install() { vmove usr/include vmove usr/lib/pkgconfig vmove usr/share/gir-1.0 vmove usr/share/gtk-doc + vmove "usr/lib/*.so" } } glade3_package() { depends="hicolor-icon-theme desktop-file-utils" pkg_install() { - vmove usr/bin - vmove usr/share/help - vmove usr/share/icons - vmove usr/share/glade - vmove usr/share/applications - vmove usr/share/locale + vmove all } } From 783f760b67034cf69062bbfd02da3589e534ce6b Mon Sep 17 00:00:00 2001 From: Juan RP Date: Thu, 26 Sep 2013 23:31:46 +0200 Subject: [PATCH 110/159] gdl: update to 3.10.0. --- srcpkgs/gdl/template | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/srcpkgs/gdl/template b/srcpkgs/gdl/template index bb8e6fcd6d9..f8f61a8f9ff 100644 --- a/srcpkgs/gdl/template +++ b/srcpkgs/gdl/template @@ -1,31 +1,31 @@ # Template file for 'gdl' pkgname=gdl -version=3.8.1 -revision=2 +version=3.10.0 +revision=1 build_style=gnu-configure -hostmakedepends="pkg-config" -makedepends="libxml2-devel gtk+3-devel intltool gobject-introspection" -short_desc="GNOME Docking Library " +hostmakedepends="pkg-config intltool gobject-introspection" +makedepends="libxml2-devel gtk+3-devel" +short_desc="GNOME Docking Library" maintainer="davehome " license="GPL-2" homepage="https://developer.gnome.org/gdl/" -distfiles="${GNOME_SITE}/${pkgname}/3.8/${pkgname}-${version}.tar.xz" -checksum=c9911e9eec5a62497fff7e044ca9eaae47354658238e6b9e9a0a744f05b4ebdb -long_desc=" - GNOME Docking Library " +distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" +checksum=4e0d6f66115ba3b0f3cd2495d8a95c6714d701f89d556bb691bd0c0a62a1c760 gdl-devel_package() { - short_desc+=" (Development files)" - depends="gdl" + short_desc+=" - Development files" + depends="gdl>=${version}" pkg_install() { vmove usr/share/gir-1.0 vmove usr/include vmove usr/lib/pkgconfig + vmove "usr/lib/*.so" } } gdl-doc_package() { - short_desc+=" (Documentation)" + short_desc+=" - Documentation" + noarch=yes pkg_install() { vmove usr/share/gtk-doc } @@ -33,6 +33,6 @@ gdl-doc_package() { gdl_package() { pkg_install() { - vmove usr + vmove all } } From f933300fceafe25f5dd614d96b8f6b4eb249c244 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Thu, 26 Sep 2013 23:35:54 +0200 Subject: [PATCH 111/159] anjuta: update to 3.10.0. --- srcpkgs/anjuta/template | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/srcpkgs/anjuta/template b/srcpkgs/anjuta/template index 417a0a04232..814f8082b2a 100644 --- a/srcpkgs/anjuta/template +++ b/srcpkgs/anjuta/template @@ -1,14 +1,14 @@ # Template file for 'anjuta' pkgname=anjuta -version=3.8.4 -revision=4 +version=3.10.0 +revision=1 build_style=gnu-configure short_desc="GNOME Integrated Development Environment" maintainer="davehome " license="GPL-2" homepage="https://projects.gnome.org/anjuta" -distfiles="${GNOME_SITE}/${pkgname}/3.8/${pkgname}-${version}.tar.xz" -checksum=eea77ef71dd156a2296cbaf02a343f3b9099aec245ee7d1495f002ff2f81fa17 +distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" +checksum=72c8569fcd629f3ed1f248cfd452e1f0b473e890421679bd5bb4d6ab2ce3fedb long_desc=" Anjuta DevStudio is a versatile software development studio featuring a number of advanced programming facilities including project management, application @@ -16,25 +16,25 @@ long_desc=" profiler and many more tools. It focuses on providing simple and usable user interface, yet powerful for efficient development." -hostmakedepends="pkg-config intltool flex itstool python autogen" -# XXX subversion plugin -makedepends="gtk+-devel gtksourceview-devel libxml2-devel vte3-devel - libxslt-devel glade3-devel graphviz-devel vala-devel gdl-devel gjs-devel - gobject-introspection libgda-devel devhelp-devel>=3.8.2_2 sqlite-devel - python-devel" +hostmakedepends="pkg-config intltool flex itstool python autogen gobject-introspection" +makedepends="gtksourceview-devel>=3.10 libxml2-devel vte3-devel gjs-devel>=1.38 + libxslt-devel glade3-devel>=3.16 graphviz-devel vala-devel>=0.22 gdl-devel>=3.10 + libgda-devel devhelp-devel>=3.10 sqlite-devel apr-util-devel + neon-devel subversion-devel python-devel" anjuta-devel_package() { - short_desc+=" (Development files)" - depends="anjuta" + short_desc+=" - Development files" + depends="anjuta>=${version}" pkg_install() { vmove usr/include vmove usr/lib/pkgconfig vmove usr/share/gir-1.0 + vmove "usr/lib/*.so" } } anjuta-docs_package() { - short_desc+=" (Documentation)" + short_desc+=" - Documentation" noarch=yes pkg_install() { vmove usr/share/doc @@ -45,6 +45,6 @@ anjuta-docs_package() { anjuta_package() { depends="autogen" pkg_install() { - vmove usr + vmove all } } From eb04780ff1186070adbec88f6073d6c5ff56025d Mon Sep 17 00:00:00 2001 From: Juan RP Date: Thu, 26 Sep 2013 23:39:36 +0200 Subject: [PATCH 112/159] gnome-boxes: update to 3.10.0. --- srcpkgs/gnome-boxes/template | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/srcpkgs/gnome-boxes/template b/srcpkgs/gnome-boxes/template index 6920a2c1f4b..ed7078bbf1d 100644 --- a/srcpkgs/gnome-boxes/template +++ b/srcpkgs/gnome-boxes/template @@ -1,18 +1,20 @@ # Template file for 'gnome-boxes' pkgname=gnome-boxes -version=3.8.4 +version=3.10.0 revision=1 +# XXX smartcard and ovirt support. build_style=gnu-configure hostmakedepends="pkg-config intltool itstool gobject-introspection" -makedepends="clutter-gtk-devel gtk+3-devel gtk-vnc-devel libuuid-devel +makedepends="clutter-gtk-devel>=1.4.4_2 gtk+3-devel gtk-vnc-devel libuuid-devel libvirt-glib-devel>=0.1.6 libxml2-devel libgudev-devel libosinfo-devel>=0.2.7 - tracker-devel spice-gtk-devel>=0.14_4 spice-protocol vala-devel libsoup-devel" + tracker-devel spice-gtk-devel>=0.14_4 spice-protocol vala-devel>=0.22 + libsoup-devel>=2.44 qemu" short_desc="GNOME 3 application to access remote or virtual systems" maintainer="davehome " homepage="https://live.gnome.org/Boxes" license="LGPL-2" -distfiles="${GNOME_SITE}/$pkgname/3.8/$pkgname-$version.tar.xz" -checksum=771f99e33fa08716df01df11ce20fbe8d7047a0f6390e470d7c3491cc4cde52b +distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" +checksum=906d5e7aaf4c0d90ea34ce019d5d2cf8665827cea28c21e811e6a2a509a7459e gnome-boxes_package() { depends="qemu libvirt-glib>=0.1.6 libosinfo>=0.2.7 desktop-file-utils hicolor-icon-theme shared-mime-info" From cbefd6b28623b9ccc47028d0259d6421a319d1ac Mon Sep 17 00:00:00 2001 From: Juan RP Date: Thu, 26 Sep 2013 23:41:49 +0200 Subject: [PATCH 113/159] gnome-clocks: update to 3.10.0. --- srcpkgs/gnome-clocks/template | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/srcpkgs/gnome-clocks/template b/srcpkgs/gnome-clocks/template index 88085e8b6e8..6ce55010eab 100644 --- a/srcpkgs/gnome-clocks/template +++ b/srcpkgs/gnome-clocks/template @@ -1,18 +1,18 @@ # Template file for 'gnome-clocks' pkgname=gnome-clocks -version=3.8.2 +version=3.10.0 revision=1 build_style=gnu-configure -hostmakedepends="pkg-config intltool gobject-introspection" -makedepends="glib-devel vala-devel>=0.20 gnome-desktop-devel>=3.8 - libgweather-devel>=3.8 libcanberra-devel libnotify-devel - desktop-file-utils hicolor-icon-theme" +hostmakedepends="pkg-config intltool itstool gobject-introspection" +makedepends="glib-devel vala-devel>=0.22 gnome-desktop-devel>=3.10 + libgweather-devel>=3.10 libcanberra-devel libnotify-devel + geocode-glib-devel geoclue2 desktop-file-utils hicolor-icon-theme" short_desc="Clock application for the GNOME Desktop" maintainer="davehome " homepage="https://live.gnome.org/GnomeClocks" license="GPL-2" -distfiles="${GNOME_SITE}/$pkgname/3.8/${pkgname}-${version}.tar.xz" -checksum=afe8405e41d8d2ac570642c2d73a43a2a45f8c6e521640d0a266e0fe0a55410f +distfiles="${GNOME_SITE}/$pkgname/${version%.*}/${pkgname}-${version}.tar.xz" +checksum=f6418272e8d3a9ad41fba49712917130b09db925b6caecd78653541aedee3e2d long_desc=" GNOME Clocks is a nice simple app to show the time, date, and alarms. @@ -22,7 +22,7 @@ long_desc=" - Times/dates in other locations" gnome-clocks_package() { - depends="desktop-file-utils hicolor-icon-theme" + depends="geoclue2 desktop-file-utils hicolor-icon-theme" pkg_install() { vmove all } From 0f38c709b5eb10eb8353df6edcc1175a33e1dd2e Mon Sep 17 00:00:00 2001 From: Juan RP Date: Thu, 26 Sep 2013 23:45:10 +0200 Subject: [PATCH 114/159] mash: rebuild against cogl/clutter 1.16. --- srcpkgs/mash/template | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/srcpkgs/mash/template b/srcpkgs/mash/template index 4c69f7d6041..c14e3967bcc 100644 --- a/srcpkgs/mash/template +++ b/srcpkgs/mash/template @@ -1,11 +1,11 @@ # Template file for 'mash' pkgname=mash version=0.2.0 -revision=3 +revision=4 build_style=gnu-configure configure_args="--enable-introspection --disable-static" hostmakedepends="pkg-config intltool gobject-introspection" -makedepends="clutter-devel>=1.12" +makedepends="clutter-devel>=1.16" short_desc="A small library for using 3D models within a Clutter scene" maintainer="Juan RP " homepage="http://www.clutter-project.org" @@ -19,18 +19,20 @@ long_desc=" lighting model with animatable lights." mash-devel_package() { - depends="clutter-devel>=1.12 mash>=${version}_${revision}" - short_desc="${short_desc} - development files" + depends="clutter-devel>=1.16 mash>=${version}_${revision}" + short_desc+=" - development files" pkg_install() { vmove usr/include vmove usr/lib/pkgconfig vmove usr/share/gtk-doc - vmove "usr/share/gir-*" + vmove usr/share/gir-1.0 + vmove "usr/lib/*.so" } } mash_package() { + depends="clutter>=1.16" pkg_install() { - vmove usr + vmove all } } From 46fa7ad00531491125330d318db9afe591a9f48f Mon Sep 17 00:00:00 2001 From: Juan RP Date: Thu, 26 Sep 2013 23:47:01 +0200 Subject: [PATCH 115/159] gnome-color-manager: update to 3.10.0. --- common/shlibs | 2 +- srcpkgs/gnome-color-manager/template | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/common/shlibs b/common/shlibs index 112e1a057b6..68727e506f2 100644 --- a/common/shlibs +++ b/common/shlibs @@ -967,7 +967,7 @@ liblutok.so.0 lutok-0.1_1 libmtdev.so.1 mtdev-1.1.2_1 libcryptsetup.so.4 libcryptsetup-1.4.1_1 libgusb.so.2 libgusb-0.1.3_1 -libmash-0.2.so.0 mash-0.2.0_1 +libmash-0.2.so.0 mash-0.2.0_4 libudisks2.so.0 udisks2-1.93.0_1 libgcr-base-3.so.1 gcr-3.3.92_1 libgck-1.so.0 gcr-3.8.0_1 diff --git a/srcpkgs/gnome-color-manager/template b/srcpkgs/gnome-color-manager/template index 35b468b5154..4305bc7d038 100644 --- a/srcpkgs/gnome-color-manager/template +++ b/srcpkgs/gnome-color-manager/template @@ -1,21 +1,21 @@ # Template file for 'gnome-color-manager' pkgname=gnome-color-manager -version=3.8.3 +version=3.10.0 revision=1 build_style=gnu-configure configure_args="--disable-schemas-compile --enable-clutter --enable-packagekit --enable-exiv" hostmakedepends="pkg-config intltool itstool gnome-doc-utils" makedepends="exiv2-devel colord-devel>=1.0.3 gtk+3-devel - clutter-gtk-devel>=1.4.4 libcanberra-devel gnome-desktop-devel>=3.8 - libexif-devel vte3-devel colord-gtk-devel mash-devel + clutter-gtk-devel>=1.4.4_2 libcanberra-devel gnome-desktop-devel>=3.10 + libexif-devel vte3-devel colord-gtk-devel mash-devel>=0.2.0_4 shared-color-profiles shared-color-targets" short_desc="Color profile manager for the GNOME desktop" maintainer="Juan RP " homepage="http://projects.gnome.org/gnome-color-manager/" license="GPL-2" -distfiles="${GNOME_SITE}/$pkgname/3.8/$pkgname-$version.tar.xz" -checksum=9125f438321c686c578b37f37a7bfab1ec8dbb519c06031a682b1eb49f474279 +distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" +checksum=95e27198fb6c7d45918d1a47a440ed5af0c65bbe2ec53fb8898d4c00c7dc8f00 gnome-color-manager_package() { depends="desktop-file-utils hicolor-icon-theme colord From 3ef33dccdc7e9b16bd402a692042661e3c3e9f98 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Thu, 26 Sep 2013 23:49:42 +0200 Subject: [PATCH 116/159] gnome-documents: update to 3.10.0. --- srcpkgs/gnome-documents/template | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/srcpkgs/gnome-documents/template b/srcpkgs/gnome-documents/template index 2117b5a798c..1703ec0d644 100644 --- a/srcpkgs/gnome-documents/template +++ b/srcpkgs/gnome-documents/template @@ -1,18 +1,19 @@ # Template file for 'gnome-documents' pkgname=gnome-documents -version=3.8.4 +version=3.10.0 revision=1 build_style=gnu-configure hostmakedepends="pkg-config intltool itstool docbook-xsl gobject-introspection" -makedepends="clutter-gtk-devel>=1.4.4 gnome-desktop-devel>=3.8 libzapojit-devel - gnome-online-accounts-devel>=3.8 libgdata-devel>=0.13.3 tracker-devel>=0.16 - evince-devel>=3.8 gjs-devel libsoup-gnome-devel vala-devel>=0.20 webkitgtk-devel" +makedepends="clutter-gtk-devel>=1.4.4_2 gnome-desktop-devel>=3.10 libzapojit-devel>=0.0.3_3 + gnome-online-accounts-devel>=3.10 libgdata-devel>=0.14 tracker-devel>=0.16_2 + evince-devel>=3.10 gjs-devel>=1.38 libsoup-gnome-devel>=2.44 vala-devel>=0.22 + webkitgtk-devel>=2.1" short_desc="Documents Manager for GNOME" maintainer="Juan RP " homepage="http://www.gnome.org" license="GPL-2" -distfiles="${GNOME_SITE}/$pkgname/3.8/$pkgname-$version.tar.xz" -checksum=daebb07b2e0767677e5fbdc4f5b5ca6672089565f955e3a42505e3f784e02ed9 +distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" +checksum=93365aee61c2777d1fe70fa8f55f6e3ce9e7e130dd2869d74eb85787825be9f6 gnome-documents_package() { depends="desktop-file-utils hicolor-icon-theme" From 859f2fb460f669daa66ad6717ef7828852295fb3 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Thu, 26 Sep 2013 23:51:19 +0200 Subject: [PATCH 117/159] gnome-getting-started-docs: update to 3.10.0. --- srcpkgs/gnome-getting-started-docs/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/gnome-getting-started-docs/template b/srcpkgs/gnome-getting-started-docs/template index 63d3dabbf2e..e0727a489e3 100644 --- a/srcpkgs/gnome-getting-started-docs/template +++ b/srcpkgs/gnome-getting-started-docs/template @@ -1,6 +1,6 @@ # Template file for 'gnome-gettings-stated-docs' pkgname=gnome-getting-started-docs -version=3.8.1 +version=3.10.0 revision=1 build_style=gnu-configure hostmakedepends="pkg-config intltool itstool gnome-doc-utils" @@ -9,8 +9,8 @@ homepage="http://www.gnome.org" short_desc="Getting Started documentation for GNOME" maintainer="Juan RP " license="GPL-2" -distfiles="${GNOME_SITE}/$pkgname/3.8/$pkgname-$version.tar.xz" -checksum=6406888a15af31db6d64025997d29592b2d10439637e63b319a8f50540764192 +distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" +checksum=0e78a4bd57c5672f4ef4753073564b17fc83dae3bf808a808ebdd1633cfbb883 gnome-getting-started-docs_package() { depends="yelp" From 7491d6fbc4af558a6fd8e5d4d1f8c780a5137e3e Mon Sep 17 00:00:00 2001 From: Juan RP Date: Thu, 26 Sep 2013 23:54:27 +0200 Subject: [PATCH 118/159] gnome-initial-setup: update to 3.10.0. --- srcpkgs/gnome-initial-setup/template | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/srcpkgs/gnome-initial-setup/template b/srcpkgs/gnome-initial-setup/template index ca2405d0303..01ca698d1f8 100644 --- a/srcpkgs/gnome-initial-setup/template +++ b/srcpkgs/gnome-initial-setup/template @@ -1,20 +1,20 @@ # Template file for 'gnome-initial-setup'. pkgname=gnome-initial-setup -version=0.10 +version=3.10.0 revision=1 build_style=gnu-configure hostmakedepends="pkg-config intltool gobject-introspection" makedepends="NetworkManager-devel accountsservice-devel - gnome-desktop-devel cheese-devel geoclue-devel libgweather-devel - gnome-online-accounts-devel gdm-devel libpwquality-devel - mit-krb5-devel vala-devel network-manager-applet-devel polkit-devel + gnome-desktop-devel>=3.10 cheese-devel>=3.10 libgweather-devel>=3.10 + gnome-online-accounts-devel>=3.10 gdm-devel>=3.10 libpwquality-devel + mit-krb5-devel vala-devel>=0.22 network-manager-applet-devel polkit-devel ibus-devel iso-codes" short_desc="The GNOME initial setup" maintainer="Juan RP " homepage="http://www.gnome.org" license="GPL-2" -distfiles="${GNOME_SITE}/$pkgname/0.10/$pkgname-$version.tar.xz" -checksum=d359cc2b37bf335a4c78ec1aa10633c5d809b7342f024985f9102b3c06b40685 +distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" +checksum=36c83852c60630ee007c48822e3d66de986c20c4c5104295aebadbe7ac7046a7 long_desc=" After acquiring or installing a new system there are a few essential things to set up before use. gnome-initial-setup aims to provide a simple, easy, @@ -23,6 +23,6 @@ long_desc=" gnome-initial-setup_package() { depends="iso-codes" pkg_install() { - vmove usr + vmove all } } From ff38c96ef80bdf6a348e91be9cf23a7e7a715e13 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Thu, 26 Sep 2013 23:57:55 +0200 Subject: [PATCH 119/159] New package: gnome-maps-3.10.0. --- srcpkgs/gnome-maps/template | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 srcpkgs/gnome-maps/template diff --git a/srcpkgs/gnome-maps/template b/srcpkgs/gnome-maps/template new file mode 100644 index 00000000000..03bce641706 --- /dev/null +++ b/srcpkgs/gnome-maps/template @@ -0,0 +1,21 @@ +# Template file for 'gnome-maps' +pkgname=gnome-maps +version=3.10.0 +revision=1 +build_style=gnu-configure +hostmakedepends="pkg-config intltool gobject-introspection" +makedepends="gjs-devel>=1.38 gnome-desktop-devel>=3.10 geocode-glib-devel" +short_desc="GNOME maps application" +maintainer="Juan RP " +homepage="http://live.gnome.org/Design/Apps/Maps" +license="GPL-2" +distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" +checksum=6e6c0360ddce96698a82ab5993ae70f5a6b3bcb23ecf139bbf8b0dfe0daa1a78 + +gnome-maps_package() { + depends="gjs desktop-file-utils" + noarch=yes + pkg_install() { + vmove all + } +} From bd854e4244120714fcd15df6a09b34d2fca20117 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Fri, 27 Sep 2013 00:01:55 +0200 Subject: [PATCH 120/159] New package: gnome-music-3.10.0. --- srcpkgs/gnome-music/template | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 srcpkgs/gnome-music/template diff --git a/srcpkgs/gnome-music/template b/srcpkgs/gnome-music/template new file mode 100644 index 00000000000..04c8f0e6622 --- /dev/null +++ b/srcpkgs/gnome-music/template @@ -0,0 +1,20 @@ +# Template file for 'gnome-music' +pkgname=gnome-music +version=3.10.0 +revision=1 +build_style=gnu-configure +hostmakedepends="pkg-config intltool gobject-introspection" +makedepends="python3-devel grilo-devel gnome-desktop-devel>=3.10" +short_desc="GNOME music playing application" +maintainer="Juan RP " +homepage="http://live.gnome.org/Apps/Music" +license="GPL-2" +distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" +checksum=16ecbb93f4e69a7e85b86fc73413744073d69edaa09e71e135afe2c8de5b1d69 + +gnome-music_package() { + depends="python3 desktop-file-utils" + pkg_install() { + vmove all + } +} From f80e34bdf922a12e2354c262930f70f450118750 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Fri, 27 Sep 2013 00:08:45 +0200 Subject: [PATCH 121/159] grilo: bump libsoup requirement. --- srcpkgs/grilo/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/grilo/template b/srcpkgs/grilo/template index 6b8b6505d67..113b73879af 100644 --- a/srcpkgs/grilo/template +++ b/srcpkgs/grilo/template @@ -1,12 +1,12 @@ # Template file for 'grilo' pkgname=grilo version=0.2.7 -revision=1 +revision=2 build_style=gnu-configure configure_args="--enable-vala --disable-static --libdir=/usr/lib" hostmakedepends="pkg-config intltool gobject-introspection" -makedepends="vala-devel>=0.20 gtk+3-devel>=3.8 libxml2-devel libsoup-devel - liboauth-devel" +makedepends="vala-devel>=0.22 gtk+3-devel>=3.8 libxml2-devel + libsoup-devel>=2.44 liboauth-devel" short_desc="Framework focused on making media discovery and browsing easy" maintainer="Juan RP " license="LGPL-2.1" @@ -30,7 +30,7 @@ pre_configure() { } grilo-devel_package() { - depends="gtk+3-devel libxml2-devel libsoup-devel grilo-${version}_${revision}" + depends="gtk+3-devel libxml2-devel libsoup-devel>=2.44 grilo-${version}_${revision}" short_desc+=" - development files" pkg_install() { vmove usr/include From 9a55ea82798248022367bcceb19ad1355beef3e3 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Fri, 27 Sep 2013 00:10:31 +0200 Subject: [PATCH 122/159] gnome-photos: update to 3.10.0. --- srcpkgs/gnome-photos/template | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/srcpkgs/gnome-photos/template b/srcpkgs/gnome-photos/template index b8899f769c9..f9e3d239ea2 100644 --- a/srcpkgs/gnome-photos/template +++ b/srcpkgs/gnome-photos/template @@ -1,19 +1,20 @@ # Template file for 'gnome-photos' pkgname=gnome-photos -version=3.8.2 +version=3.10.0 revision=1 build_style=gnu-configure configure_args="--disable-schemas-compile" hostmakedepends="pkg-config intltool itstool gnome-doc-utils gobject-introspection" -makedepends="gtk+3-devel>=3.8 babl-devel gegl-devel exempi-devel lcms2-devel - tracker-devel libexif-devel librsvg-devel gnome-desktop-devel - gnome-online-accounts-devel" +makedepends=" + gtk+3-devel>=3.8 babl-devel gegl-devel exempi-devel lcms2-devel + tracker-devel>=0.16_2 libexif-devel librsvg-devel grilo-devel>=0.2.7_2 + gnome-online-accounts-devel>=3.10 gnome-desktop-devel>=3.10" short_desc="Access, organize, and share your photos on GNOME" maintainer="Juan RP " homepage="http://www.gnome.org" license="GPL-2" -distfiles="${GNOME_SITE}/$pkgname/3.8/$pkgname-$version.tar.xz" -checksum=c6e777cdc6a4b0ee24b4dbd1b971fe239198926a3057c27c08eeda0a53ba6d58 +distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" +checksum=65cb5790ec5a282c8bc8b4902858a0b4b3cec2fe39709a580dc073a23a5fc210 gnome-photos_package() { depends="desktop-file-utils" From 9477bb9e621dbf60cf784bf3a9305eab622f4c62 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Fri, 27 Sep 2013 00:12:18 +0200 Subject: [PATCH 123/159] gnome-weather: update to 3.10.0. --- srcpkgs/gnome-weather/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/gnome-weather/template b/srcpkgs/gnome-weather/template index 9f10dbed887..270de256242 100644 --- a/srcpkgs/gnome-weather/template +++ b/srcpkgs/gnome-weather/template @@ -1,17 +1,17 @@ # Template file for 'gnome-weather' pkgname=gnome-weather -version=3.8.2 +version=3.10.0 revision=1 build_style=gnu-configure configure_args="--disable-schemas-compile" hostmakedepends="pkg-config intltool itstool gnome-doc-utils gobject-introspection" -makedepends="gtk+3-devel>=3.8 gjs-devel libgweather-devel" +makedepends="gtk+3-devel>=3.8 gjs-devel>=1.38 libgweather-devel>=3.10" short_desc="Access current weather conditions and forecasts for GNOME" maintainer="Juan RP " homepage="http://www.gnome.org" license="GPL-2" -distfiles="${GNOME_SITE}/$pkgname/3.8/$pkgname-$version.tar.xz" -checksum=cf61afac1435dbdb87e8d9e4d86bca29cf1ff2c64cefc8db696cd27dad15adf4 +distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" +checksum=66d764a19ceebc512711a3b71c849e04021311fa12d617148bbf22c083121b69 gnome-weather_package() { depends="desktop-file-utils" From be852434bf4f85dbf462498c4de61436deba3bed Mon Sep 17 00:00:00 2001 From: Juan RP Date: Fri, 27 Sep 2013 00:13:57 +0200 Subject: [PATCH 124/159] nautilus-sendto: update to 3.8.1. --- srcpkgs/nautilus-sendto/template | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/srcpkgs/nautilus-sendto/template b/srcpkgs/nautilus-sendto/template index 952e2d37dd8..5e116288002 100644 --- a/srcpkgs/nautilus-sendto/template +++ b/srcpkgs/nautilus-sendto/template @@ -1,18 +1,18 @@ # Template file for 'nautilus-sendto' pkgname=nautilus-sendto -version=3.8.0 +version=3.8.1 revision=1 build_style=gnu-configure configure_args="--disable-schemas-compile" # XXX: add pidgin and gajim depends for plugins to work. hostmakedepends="pkg-config intltool gobject-introspection" -makedepends="evolution-data-server-devel>=3.8 nautilus-devel>=3.8 gupnp-devel" +makedepends="evolution-data-server-devel>=3.10 nautilus-devel>=3.10 gupnp-devel" short_desc="Nautilus context menu for sending files" maintainer="Juan RP " homepage="http://download.gnome.org/sources/nautilus-sendto/" license="GPL-2" -distfiles="${GNOME_SITE}/$pkgname/3.8/$pkgname-$version.tar.xz" -checksum=d99ea11a484bff8894097696a1afc8d7f44de4f064f78deeb6f598cecf0604bb +distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" +checksum=03fa46bff271acdbdedab6243b2a84e5ed3daa19c81b69d087b3e852c8fe5dab long_desc=" The Nautilus Send To plugin provides the Nautilus file manager with a context menu component for quickly sending files to accounts in an Evolution email @@ -24,6 +24,6 @@ long_desc=" nautilus-sendto_package() { pkg_install() { - vmove usr + vmove all } } From eb0407776c6cc3f1a82548cc78aa9af5f810896a Mon Sep 17 00:00:00 2001 From: Juan RP Date: Fri, 27 Sep 2013 00:16:31 +0200 Subject: [PATCH 125/159] rygel: update to 0.20.0. --- srcpkgs/rygel/template | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/srcpkgs/rygel/template b/srcpkgs/rygel/template index 98ace2f3d1a..cc7ea519e72 100644 --- a/srcpkgs/rygel/template +++ b/srcpkgs/rygel/template @@ -1,22 +1,22 @@ # Template file for 'rygel' pkgname=rygel -version=0.18.4 +version=0.20.0 revision=1 build_style=gnu-configure configure_args="--enable-gst-launch-plugin" hostmakedepends="pkg-config intltool" -makedepends="sqlite-devel vala-devel>=0.20 gtk+3-devel>=3.8 - libsoup-devel libgee08-devel>=0.10 gupnp-av-devel>=0.12.1 - gupnp-dlna-devel>=0.10 tracker-devel>=0.16" +makedepends="sqlite-devel vala-devel>=0.22 gtk+3-devel>=3.8 + libsoup-devel>=2.44 libgee08-devel>=0.12 gupnp-av-devel>=0.12.1 + gupnp-dlna-devel>=0.10 tracker-devel>=0.16_2" short_desc="GNOME home media solution" maintainer="Juan RP " homepage="http://www.gnome.org" license="GPL-2" -distfiles="${GNOME_SITE}/${pkgname}/0.18/${pkgname}-${version}.tar.xz" -checksum=f63f3f1cd1456b7e3b9232ec81ad481d220530a734ed8a09eb046d30c34d3ebe +distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" +checksum=f695bae2c20b911393f7abf265c18f3c5a5c42fe4223fc9150ab9007558363fe rygel-devel_package() { - depends="libgee08-devel gupnp-av-devel gstreamer-devel libuuid-devel + depends="libgee08-devel gupnp-av-devel libuuid-devel libglib-devel librygel-${version}_${revision}" short_desc+=" - development files" pkg_install() { From faa3ad66ec221d26474be3a46f4b447107acac90 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Fri, 27 Sep 2013 00:18:32 +0200 Subject: [PATCH 126/159] seahorse: update to 3.10.0. --- srcpkgs/seahorse/template | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/srcpkgs/seahorse/template b/srcpkgs/seahorse/template index f80ef941a03..e64da8be835 100644 --- a/srcpkgs/seahorse/template +++ b/srcpkgs/seahorse/template @@ -1,20 +1,20 @@ # Template file for 'seahorse' pkgname=seahorse -version=3.8.2 +version=3.10.0 revision=1 build_style=gnu-configure configure_args="--disable-schemas-compile --enable-ldap --enable-hkp --disable-debug" hostmakedepends="which pkg-config intltool gnome-doc-utils itstool" -makedepends="gtk+3-devel>=3.8 gcr-devel>=3.8 libsecret-devel +makedepends="gtk+3-devel>=3.8 gcr-devel>=3.10 libsecret-devel gpgme-devel libldap-devel libsoup-devel avahi-glib-libs-devel openssh>=6.1p1" short_desc="Encryption Made Easy" maintainer="Juan RP " homepage="http://projects.gnome.org/seahorse/" license="GPL-2" -distfiles="${GNOME_SITE}/$pkgname/3.8/$pkgname-$version.tar.xz" -checksum=b3837d088b7e3f7ebc41cb3f11c5c85e2df7e06bdc538a3e85bb1a13c34c9a12 +distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" +checksum=98023cb8805cf778163833ddba783ba1505c0595683e1ac92109d27e8556fbde long_desc=" Seahorse is a GNOME application for managing encryption keys. It also integrates with nautilus, gedit and other places for encryption operations. @@ -29,7 +29,7 @@ long_desc=" * more..." seahorse_package() { - depends="hicolor-icon-theme desktop-file-utils gcr>=3.6.2 openssh>=6.1p1" + depends="hicolor-icon-theme desktop-file-utils gcr>=3.10 openssh>=6.1p1" pkg_install() { vmove all } From 913b4c4a8b3382b01bb64ddace146bbb50cf7966 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Fri, 27 Sep 2013 00:20:10 +0200 Subject: [PATCH 127/159] vinagre: update to 3.10.0. --- srcpkgs/vinagre/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/vinagre/template b/srcpkgs/vinagre/template index 59a43c58ecf..bf7894590b7 100644 --- a/srcpkgs/vinagre/template +++ b/srcpkgs/vinagre/template @@ -1,6 +1,6 @@ # Template file for 'vinagre' pkgname=vinagre -version=3.8.3 +version=3.10.0 revision=1 build_style=gnu-configure configure_args="--disable-schemas-compile" @@ -12,8 +12,8 @@ short_desc="VNC client for the GNOME desktop" maintainer="Juan RP " homepage="http://projects.gnome.org/vinagre" license="GPL-2" -distfiles="${GNOME_SITE}/$pkgname/3.8/$pkgname-$version.tar.xz" -checksum=0d862429307d28333f17afa40cf81f6006903e1aa134a8bc430079a9db40b1c6 +distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" +checksum=d90ca19d1075149d044a58274016bb3976b2201774ae079d661fd7c3859a1900 long_desc=" Features You can connect to several machines at the same time, we like tabs From b480cfb50368fd7abd99197d240c4bb235b1f954 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Fri, 27 Sep 2013 00:59:04 +0200 Subject: [PATCH 128/159] gnome-initial-setup: update to 3.10.0.1. --- srcpkgs/gnome-initial-setup/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/gnome-initial-setup/template b/srcpkgs/gnome-initial-setup/template index 01ca698d1f8..670c47ea19b 100644 --- a/srcpkgs/gnome-initial-setup/template +++ b/srcpkgs/gnome-initial-setup/template @@ -1,6 +1,6 @@ # Template file for 'gnome-initial-setup'. pkgname=gnome-initial-setup -version=3.10.0 +version=3.10.0.1 revision=1 build_style=gnu-configure hostmakedepends="pkg-config intltool gobject-introspection" @@ -13,8 +13,8 @@ short_desc="The GNOME initial setup" maintainer="Juan RP " homepage="http://www.gnome.org" license="GPL-2" -distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" -checksum=36c83852c60630ee007c48822e3d66de986c20c4c5104295aebadbe7ac7046a7 +distfiles="${GNOME_SITE}/$pkgname/3.10/$pkgname-$version.tar.xz" +checksum=23cc0db45bd8e229862e3647e2429eb8da3474d9163b22e26ae012989974dae1 long_desc=" After acquiring or installing a new system there are a few essential things to set up before use. gnome-initial-setup aims to provide a simple, easy, From 34a4588cd023155ebdda3d4b002575431a560435 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Fri, 27 Sep 2013 01:35:03 +0200 Subject: [PATCH 129/159] pyatspi: update to 2.10.0. --- srcpkgs/pyatspi/template | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/srcpkgs/pyatspi/template b/srcpkgs/pyatspi/template index 53efb33e0a3..10c65cb9af7 100644 --- a/srcpkgs/pyatspi/template +++ b/srcpkgs/pyatspi/template @@ -1,23 +1,22 @@ # Template file for 'pyatspi' pkgname=pyatspi -version=2.3.92 +version=2.10.0 revision=1 build_style=gnu-configure -makedepends="at-spi2-core-devel pygobject-devel" +hostmakedepends="pkg-config" +makedepends="at-spi2-core-devel>=2.10 pygobject-devel>=3.10" short_desc="Python bindings for AT-SPI" maintainer="Juan RP " homepage="http://www.gnome.org" license="GPL-2" -distfiles="${GNOME_SITE}/$pkgname/2.3/$pkgname-$version.tar.xz" -checksum=d3df7d62b384d0274387422744df4fc7079a1945dbe81a5eef32318285196ac1 -long_desc=" - This packages the Python language bindings for AT-SPI." +distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" +checksum=42f89ddb9a236448503573e4cd1ddb174e233e005316de9acdb957eb1aa9ad84 pyatspi_package() { noarch="yes" pycompile_module="pyatspi" - depends="at-spi2-core pygobject" + depends="at-spi2-core>=2.10 pygobject>=3.10" pkg_install() { - vmove usr + vmove all } } From facf37b13e701d3899196c698f91ad88cdc71814 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Fri, 27 Sep 2013 01:52:05 +0200 Subject: [PATCH 130/159] python3: fix multiple issues. --- srcpkgs/python3/template | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/srcpkgs/python3/template b/srcpkgs/python3/template index 811123185e3..7dcfc4221c3 100644 --- a/srcpkgs/python3/template +++ b/srcpkgs/python3/template @@ -1,7 +1,7 @@ # Template build file for 'python3'. pkgname=python3 version=3.3.2 -revision=1 +revision=2 wrksrc="Python-${version}" short_desc="Interpreted, interactive, object-oriented programming language (3.x series)" maintainer="Juan RP " @@ -53,17 +53,20 @@ do_install() { } python3-devel_package() { - depends="python3>=${version}" + depends="python3>=${version}_${revision}" short_desc+=" - development files" pkg_install() { vmove "usr/bin/python*-config" vmove usr/lib/pkgconfig - vmove "usr/include/python3*/*" + vmove usr/include + mkdir -p ${DESTDIR}/usr/include/python3.3m + mv ${PKGDESTDIR}/usr/include/python3.3m/pyconfig.h \ + ${DESTDIR}/usr/include/python3.3m } } python3_package() { pkg_install() { - vmove usr + vmove all } } From 7c23307f5428c91c043ce47f85d5a6866e90168c Mon Sep 17 00:00:00 2001 From: Juan RP Date: Fri, 27 Sep 2013 02:15:26 +0200 Subject: [PATCH 131/159] New package: py2cairo-1.10. --- srcpkgs/py2cairo-devel | 1 + srcpkgs/py2cairo/template | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 33 insertions(+) create mode 120000 srcpkgs/py2cairo-devel create mode 100644 srcpkgs/py2cairo/template diff --git a/srcpkgs/py2cairo-devel b/srcpkgs/py2cairo-devel new file mode 120000 index 00000000000..a3693161767 --- /dev/null +++ b/srcpkgs/py2cairo-devel @@ -0,0 +1 @@ +py2cairo \ No newline at end of file diff --git a/srcpkgs/py2cairo/template b/srcpkgs/py2cairo/template new file mode 100644 index 00000000000..0068dfa6b1b --- /dev/null +++ b/srcpkgs/py2cairo/template @@ -0,0 +1,32 @@ +# Template file for 'py2cairo' +pkgname=py2cairo +version=1.10.0 +revision=1 +build_style=waf +hostmakedepends="pkg-config which" +makedepends="cairo-devel python-devel" +short_desc="Python2 bindings for the cairo graphics library" +homepage="http://cairographics.org/pycairo/" +license="LGPL-3" +maintainer="Juan RP " +distfiles="http://cairographics.org/releases/$pkgname-$version.tar.bz2" +checksum=d30439f06c2ec1a39e27464c6c828b6eface3b22ee17b2de05dc409e429a7431 + +py2cairo-devel_package() { + replaces="pycairo-devel<1.10" + depends="${sourcepkg}>=${version}" + short_desc+=" - development files" + pkg_install() { + vmove usr/include + vmove usr/lib/pkgconfig + } +} + +py2cairo_package() { + replaces="pycairo<1.10" + depends="python" + pycompile_module="cairo" + pkg_install() { + vmove all + } +} From 9445045c77e3d85610a3d2f4d0d904ba339ed358 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Fri, 27 Sep 2013 02:31:21 +0200 Subject: [PATCH 132/159] python3: add security patches; misc tweaks. --- .../patches/python-3.3.2-CVE-2013-2099.patch | 49 ++++ .../patches/python-3.3.2-CVE-2013-4238.patch | 255 ++++++++++++++++++ srcpkgs/python3/template | 11 +- 3 files changed, 308 insertions(+), 7 deletions(-) create mode 100644 srcpkgs/python3/patches/python-3.3.2-CVE-2013-2099.patch create mode 100644 srcpkgs/python3/patches/python-3.3.2-CVE-2013-4238.patch diff --git a/srcpkgs/python3/patches/python-3.3.2-CVE-2013-2099.patch b/srcpkgs/python3/patches/python-3.3.2-CVE-2013-2099.patch new file mode 100644 index 00000000000..67ea67e75f2 --- /dev/null +++ b/srcpkgs/python3/patches/python-3.3.2-CVE-2013-2099.patch @@ -0,0 +1,49 @@ +# HG changeset patch +# User Antoine Pitrou +# Date 1368892602 -7200 +# Node ID c627638753e2d25a98950585b259104a025937a9 +# Parent 9682241dc8fcb4b1aef083bd30860efa070c3d6d +Issue #17980: Fix possible abuse of ssl.match_hostname() for denial of service using certificates with many wildcards (CVE-2013-2099). + +diff --git a/Lib/ssl.py b/Lib/ssl.py +--- Lib/ssl.py ++++ Lib/ssl.py +@@ -129,9 +129,16 @@ class CertificateError(ValueError): + pass + + +-def _dnsname_to_pat(dn): ++def _dnsname_to_pat(dn, max_wildcards=1): + pats = [] + for frag in dn.split(r'.'): ++ if frag.count('*') > max_wildcards: ++ # Issue #17980: avoid denials of service by refusing more ++ # than one wildcard per fragment. A survery of established ++ # policy among SSL implementations showed it to be a ++ # reasonable choice. ++ raise CertificateError( ++ "too many wildcards in certificate DNS name: " + repr(dn)) + if frag == '*': + # When '*' is a fragment by itself, it matches a non-empty dotless + # fragment. +diff --git a/Lib/test/test_ssl.py b/Lib/test/test_ssl.py +--- Lib/test/test_ssl.py ++++ Lib/test/test_ssl.py +@@ -349,6 +349,17 @@ class BasicSocketTests(unittest.TestCase + self.assertRaises(ValueError, ssl.match_hostname, None, 'example.com') + self.assertRaises(ValueError, ssl.match_hostname, {}, 'example.com') + ++ # Issue #17980: avoid denials of service by refusing more than one ++ # wildcard per fragment. ++ cert = {'subject': ((('commonName', 'a*b.com'),),)} ++ ok(cert, 'axxb.com') ++ cert = {'subject': ((('commonName', 'a*b.co*'),),)} ++ ok(cert, 'axxb.com') ++ cert = {'subject': ((('commonName', 'a*b*.com'),),)} ++ with self.assertRaises(ssl.CertificateError) as cm: ++ ssl.match_hostname(cert, 'axxbxxc.com') ++ self.assertIn("too many wildcards", str(cm.exception)) ++ + def test_server_side(self): + # server_hostname doesn't work for server sockets + ctx = ssl.SSLContext(ssl.PROTOCOL_SSLv23) diff --git a/srcpkgs/python3/patches/python-3.3.2-CVE-2013-4238.patch b/srcpkgs/python3/patches/python-3.3.2-CVE-2013-4238.patch new file mode 100644 index 00000000000..31f15183b60 --- /dev/null +++ b/srcpkgs/python3/patches/python-3.3.2-CVE-2013-4238.patch @@ -0,0 +1,255 @@ + +# HG changeset patch +# User Christian Heimes +# Date 1376693687 -7200 +# Node ID c9f073e593b037e8a29e386326859537691bcf62 +# Parent 3105b78d34346ea36c52a3b7e635954f4b444120 +Issue #18709: Fix CVE-2013-4238. The SSL module now handles NULL bytes +inside subjectAltName correctly. Formerly the module has used OpenSSL's +GENERAL_NAME_print() function to get the string represention of ASN.1 +strings for rfc822Name (email), dNSName (DNS) and +uniformResourceIdentifier (URI). + +diff --git a/Lib/test/nullbytecert.pem b/Lib/test/nullbytecert.pem +new file mode 100644 +--- /dev/null ++++ Lib/test/nullbytecert.pem +@@ -0,0 +1,90 @@ ++Certificate: ++ Data: ++ Version: 3 (0x2) ++ Serial Number: 0 (0x0) ++ Signature Algorithm: sha1WithRSAEncryption ++ Issuer: C=US, ST=Oregon, L=Beaverton, O=Python Software Foundation, OU=Python Core Development, CN=null.python.org\x00example.org/emailAddress=python-dev@python.org ++ Validity ++ Not Before: Aug 7 13:11:52 2013 GMT ++ Not After : Aug 7 13:12:52 2013 GMT ++ Subject: C=US, ST=Oregon, L=Beaverton, O=Python Software Foundation, OU=Python Core Development, CN=null.python.org\x00example.org/emailAddress=python-dev@python.org ++ Subject Public Key Info: ++ Public Key Algorithm: rsaEncryption ++ Public-Key: (2048 bit) ++ Modulus: ++ 00:b5:ea:ed:c9:fb:46:7d:6f:3b:76:80:dd:3a:f3: ++ 03:94:0b:a7:a6:db:ec:1d:df:ff:23:74:08:9d:97: ++ 16:3f:a3:a4:7b:3e:1b:0e:96:59:25:03:a7:26:e2: ++ 88:a9:cf:79:cd:f7:04:56:b0:ab:79:32:6e:59:c1: ++ 32:30:54:eb:58:a8:cb:91:f0:42:a5:64:27:cb:d4: ++ 56:31:88:52:ad:cf:bd:7f:f0:06:64:1f:cc:27:b8: ++ a3:8b:8c:f3:d8:29:1f:25:0b:f5:46:06:1b:ca:02: ++ 45:ad:7b:76:0a:9c:bf:bb:b9:ae:0d:16:ab:60:75: ++ ae:06:3e:9c:7c:31:dc:92:2f:29:1a:e0:4b:0c:91: ++ 90:6c:e9:37:c5:90:d7:2a:d7:97:15:a3:80:8f:5d: ++ 7b:49:8f:54:30:d4:97:2c:1c:5b:37:b5:ab:69:30: ++ 68:43:d3:33:78:4b:02:60:f5:3c:44:80:a1:8f:e7: ++ f0:0f:d1:5e:87:9e:46:cf:62:fc:f9:bf:0c:65:12: ++ f1:93:c8:35:79:3f:c8:ec:ec:47:f5:ef:be:44:d5: ++ ae:82:1e:2d:9a:9f:98:5a:67:65:e1:74:70:7c:cb: ++ d3:c2:ce:0e:45:49:27:dc:e3:2d:d4:fb:48:0e:2f: ++ 9e:77:b8:14:46:c0:c4:36:ca:02:ae:6a:91:8c:da: ++ 2f:85 ++ Exponent: 65537 (0x10001) ++ X509v3 extensions: ++ X509v3 Basic Constraints: critical ++ CA:FALSE ++ X509v3 Subject Key Identifier: ++ 88:5A:55:C0:52:FF:61:CD:52:A3:35:0F:EA:5A:9C:24:38:22:F7:5C ++ X509v3 Key Usage: ++ Digital Signature, Non Repudiation, Key Encipherment ++ X509v3 Subject Alternative Name: ++ ************************************************************* ++ WARNING: The values for DNS, email and URI are WRONG. OpenSSL ++ doesn't print the text after a NULL byte. ++ ************************************************************* ++ DNS:altnull.python.org, email:null@python.org, URI:http://null.python.org, IP Address:192.0.2.1, IP Address:2001:DB8:0:0:0:0:0:1 ++ Signature Algorithm: sha1WithRSAEncryption ++ ac:4f:45:ef:7d:49:a8:21:70:8e:88:59:3e:d4:36:42:70:f5: ++ a3:bd:8b:d7:a8:d0:58:f6:31:4a:b1:a4:a6:dd:6f:d9:e8:44: ++ 3c:b6:0a:71:d6:7f:b1:08:61:9d:60:ce:75:cf:77:0c:d2:37: ++ 86:02:8d:5e:5d:f9:0f:71:b4:16:a8:c1:3d:23:1c:f1:11:b3: ++ 56:6e:ca:d0:8d:34:94:e6:87:2a:99:f2:ae:ae:cc:c2:e8:86: ++ de:08:a8:7f:c5:05:fa:6f:81:a7:82:e6:d0:53:9d:34:f4:ac: ++ 3e:40:fe:89:57:7a:29:a4:91:7e:0b:c6:51:31:e5:10:2f:a4: ++ 60:76:cd:95:51:1a:be:8b:a1:b0:fd:ad:52:bd:d7:1b:87:60: ++ d2:31:c7:17:c4:18:4f:2d:08:25:a3:a7:4f:b7:92:ca:e2:f5: ++ 25:f1:54:75:81:9d:b3:3d:61:a2:f7:da:ed:e1:c6:6f:2c:60: ++ 1f:d8:6f:c5:92:05:ab:c9:09:62:49:a9:14:ad:55:11:cc:d6: ++ 4a:19:94:99:97:37:1d:81:5f:8b:cf:a3:a8:96:44:51:08:3d: ++ 0b:05:65:12:eb:b6:70:80:88:48:72:4f:c6:c2:da:cf:cd:8e: ++ 5b:ba:97:2f:60:b4:96:56:49:5e:3a:43:76:63:04:be:2a:f6: ++ c1:ca:a9:94 ++-----BEGIN CERTIFICATE----- ++MIIE2DCCA8CgAwIBAgIBADANBgkqhkiG9w0BAQUFADCBxTELMAkGA1UEBhMCVVMx ++DzANBgNVBAgMBk9yZWdvbjESMBAGA1UEBwwJQmVhdmVydG9uMSMwIQYDVQQKDBpQ ++eXRob24gU29mdHdhcmUgRm91bmRhdGlvbjEgMB4GA1UECwwXUHl0aG9uIENvcmUg ++RGV2ZWxvcG1lbnQxJDAiBgNVBAMMG251bGwucHl0aG9uLm9yZwBleGFtcGxlLm9y ++ZzEkMCIGCSqGSIb3DQEJARYVcHl0aG9uLWRldkBweXRob24ub3JnMB4XDTEzMDgw ++NzEzMTE1MloXDTEzMDgwNzEzMTI1MlowgcUxCzAJBgNVBAYTAlVTMQ8wDQYDVQQI ++DAZPcmVnb24xEjAQBgNVBAcMCUJlYXZlcnRvbjEjMCEGA1UECgwaUHl0aG9uIFNv ++ZnR3YXJlIEZvdW5kYXRpb24xIDAeBgNVBAsMF1B5dGhvbiBDb3JlIERldmVsb3Bt ++ZW50MSQwIgYDVQQDDBtudWxsLnB5dGhvbi5vcmcAZXhhbXBsZS5vcmcxJDAiBgkq ++hkiG9w0BCQEWFXB5dGhvbi1kZXZAcHl0aG9uLm9yZzCCASIwDQYJKoZIhvcNAQEB ++BQADggEPADCCAQoCggEBALXq7cn7Rn1vO3aA3TrzA5QLp6bb7B3f/yN0CJ2XFj+j ++pHs+Gw6WWSUDpybiiKnPec33BFawq3kyblnBMjBU61ioy5HwQqVkJ8vUVjGIUq3P ++vX/wBmQfzCe4o4uM89gpHyUL9UYGG8oCRa17dgqcv7u5rg0Wq2B1rgY+nHwx3JIv ++KRrgSwyRkGzpN8WQ1yrXlxWjgI9de0mPVDDUlywcWze1q2kwaEPTM3hLAmD1PESA ++oY/n8A/RXoeeRs9i/Pm/DGUS8ZPINXk/yOzsR/XvvkTVroIeLZqfmFpnZeF0cHzL ++08LODkVJJ9zjLdT7SA4vnne4FEbAxDbKAq5qkYzaL4UCAwEAAaOB0DCBzTAMBgNV ++HRMBAf8EAjAAMB0GA1UdDgQWBBSIWlXAUv9hzVKjNQ/qWpwkOCL3XDALBgNVHQ8E ++BAMCBeAwgZAGA1UdEQSBiDCBhYIeYWx0bnVsbC5weXRob24ub3JnAGV4YW1wbGUu ++Y29tgSBudWxsQHB5dGhvbi5vcmcAdXNlckBleGFtcGxlLm9yZ4YpaHR0cDovL251 ++bGwucHl0aG9uLm9yZwBodHRwOi8vZXhhbXBsZS5vcmeHBMAAAgGHECABDbgAAAAA ++AAAAAAAAAAEwDQYJKoZIhvcNAQEFBQADggEBAKxPRe99SaghcI6IWT7UNkJw9aO9 ++i9eo0Fj2MUqxpKbdb9noRDy2CnHWf7EIYZ1gznXPdwzSN4YCjV5d+Q9xtBaowT0j ++HPERs1ZuytCNNJTmhyqZ8q6uzMLoht4IqH/FBfpvgaeC5tBTnTT0rD5A/olXeimk ++kX4LxlEx5RAvpGB2zZVRGr6LobD9rVK91xuHYNIxxxfEGE8tCCWjp0+3ksri9SXx ++VHWBnbM9YaL32u3hxm8sYB/Yb8WSBavJCWJJqRStVRHM1koZlJmXNx2BX4vPo6iW ++RFEIPQsFZRLrtnCAiEhyT8bC2s/Njlu6ly9gtJZWSV46Q3ZjBL4q9sHKqZQ= ++-----END CERTIFICATE----- +diff --git a/Lib/test/test_ssl.py b/Lib/test/test_ssl.py +--- Lib/test/test_ssl.py ++++ Lib/test/test_ssl.py +@@ -55,6 +55,7 @@ BADCERT = data_file("badcert.pem") + WRONGCERT = data_file("XXXnonexisting.pem") + BADKEY = data_file("badkey.pem") + NOKIACERT = data_file("nokia.pem") ++NULLBYTECERT = data_file("nullbytecert.pem") + + DHFILE = data_file("dh512.pem") + BYTES_DHFILE = os.fsencode(DHFILE) +@@ -162,6 +163,27 @@ class BasicSocketTests(unittest.TestCase + ('DNS', 'projects.forum.nokia.com')) + ) + ++ def test_parse_cert_CVE_2013_4238(self): ++ p = ssl._ssl._test_decode_cert(NULLBYTECERT) ++ if support.verbose: ++ sys.stdout.write("\n" + pprint.pformat(p) + "\n") ++ subject = ((('countryName', 'US'),), ++ (('stateOrProvinceName', 'Oregon'),), ++ (('localityName', 'Beaverton'),), ++ (('organizationName', 'Python Software Foundation'),), ++ (('organizationalUnitName', 'Python Core Development'),), ++ (('commonName', 'null.python.org\x00example.org'),), ++ (('emailAddress', 'python-dev@python.org'),)) ++ self.assertEqual(p['subject'], subject) ++ self.assertEqual(p['issuer'], subject) ++ self.assertEqual(p['subjectAltName'], ++ (('DNS', 'altnull.python.org\x00example.com'), ++ ('email', 'null@python.org\x00user@example.org'), ++ ('URI', 'http://null.python.org\x00http://example.org'), ++ ('IP Address', '192.0.2.1'), ++ ('IP Address', '2001:DB8:0:0:0:0:0:1\n')) ++ ) ++ + def test_DER_to_PEM(self): + with open(SVN_PYTHON_ORG_ROOT_CERT, 'r') as f: + pem = f.read() +@@ -294,6 +316,13 @@ class BasicSocketTests(unittest.TestCase + fail(cert, 'foo.a.com') + fail(cert, 'bar.foo.com') + ++ # NULL bytes are bad, CVE-2013-4073 ++ cert = {'subject': ((('commonName', ++ 'null.python.org\x00example.org'),),)} ++ ok(cert, 'null.python.org\x00example.org') # or raise an error? ++ fail(cert, 'example.org') ++ fail(cert, 'null.python.org') ++ + # Slightly fake real-world example + cert = {'notAfter': 'Jun 26 21:41:46 2011 GMT', + 'subject': ((('commonName', 'linuxfrz.org'),),), +diff --git a/Modules/_ssl.c b/Modules/_ssl.c +--- Modules/_ssl.c ++++ Modules/_ssl.c +@@ -771,12 +771,14 @@ static PyObject * + ext->value->length)); + + for(j = 0; j < sk_GENERAL_NAME_num(names); j++) { +- + /* get a rendering of each name in the set of names */ ++ int gntype; ++ ASN1_STRING *as = NULL; + + name = sk_GENERAL_NAME_value(names, j); +- if (name->type == GEN_DIRNAME) { +- ++ gntype = name-> type; ++ switch (gntype) { ++ case GEN_DIRNAME: + /* we special-case DirName as a tuple of + tuples of attributes */ + +@@ -798,11 +800,62 @@ static PyObject * + goto fail; + } + PyTuple_SET_ITEM(t, 1, v); ++ break; + +- } else { ++ case GEN_EMAIL: ++ case GEN_DNS: ++ case GEN_URI: ++ /* GENERAL_NAME_print() doesn't handle NULL bytes in ASN1_string ++ correctly, CVE-2013-4238 */ ++ t = PyTuple_New(2); ++ if (t == NULL) ++ goto fail; ++ switch (gntype) { ++ case GEN_EMAIL: ++ v = PyUnicode_FromString("email"); ++ as = name->d.rfc822Name; ++ break; ++ case GEN_DNS: ++ v = PyUnicode_FromString("DNS"); ++ as = name->d.dNSName; ++ break; ++ case GEN_URI: ++ v = PyUnicode_FromString("URI"); ++ as = name->d.uniformResourceIdentifier; ++ break; ++ } ++ if (v == NULL) { ++ Py_DECREF(t); ++ goto fail; ++ } ++ PyTuple_SET_ITEM(t, 0, v); ++ v = PyUnicode_FromStringAndSize((char *)ASN1_STRING_data(as), ++ ASN1_STRING_length(as)); ++ if (v == NULL) { ++ Py_DECREF(t); ++ goto fail; ++ } ++ PyTuple_SET_ITEM(t, 1, v); ++ break; + ++ default: + /* for everything else, we use the OpenSSL print form */ +- ++ switch (gntype) { ++ /* check for new general name type */ ++ case GEN_OTHERNAME: ++ case GEN_X400: ++ case GEN_EDIPARTY: ++ case GEN_IPADD: ++ case GEN_RID: ++ break; ++ default: ++ if (PyErr_WarnFormat(PyExc_RuntimeWarning, 1, ++ "Unknown general name type %d", ++ gntype) == -1) { ++ goto fail; ++ } ++ break; ++ } + (void) BIO_reset(biobuf); + GENERAL_NAME_print(biobuf, name); + len = BIO_gets(biobuf, buf, sizeof(buf)-1); +@@ -829,6 +882,7 @@ static PyObject * + goto fail; + } + PyTuple_SET_ITEM(t, 1, v); ++ break; + } + + /* and add that rendering to the list */ + diff --git a/srcpkgs/python3/template b/srcpkgs/python3/template index 7dcfc4221c3..fafc7aff53e 100644 --- a/srcpkgs/python3/template +++ b/srcpkgs/python3/template @@ -1,7 +1,7 @@ # Template build file for 'python3'. pkgname=python3 version=3.3.2 -revision=2 +revision=3 wrksrc="Python-${version}" short_desc="Interpreted, interactive, object-oriented programming language (3.x series)" maintainer="Juan RP " @@ -42,14 +42,11 @@ do_build() { } do_install() { - make DESTDIR=${DESTDIR} install - chmod 755 ${DESTDIR}/usr/lib/libpython*.so* + make DESTDIR=${DESTDIR} install maninstall install -Dm644 LICENSE ${DESTDIR}/usr/share/licenses/${pkgname}/LICENSE - # Remove test files. - rm -rf ${DESTDIR}/usr/lib/python3.3/test - # Remove python3.3m hardlink - rm -f ${DESTDIR}/usr/bin/python3.3m + ln -sf ../../libpython3.3m.so \ + ${DESTDIR}/usr/lib/python3.3/config-3.3m/libpython3.3m.so } python3-devel_package() { From 71e243b04dd1ae56ca74ccf92b48858e7fe8cb15 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Fri, 27 Sep 2013 02:33:06 +0200 Subject: [PATCH 133/159] Revert "xz: update to 5.1.2alpha (sigh, required by gnome-disk-utility-3.9)." This reverts commit 5bc44ef1eab50f0f14e601da515140032fdc982d. --- srcpkgs/xz/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/xz/template b/srcpkgs/xz/template index e0f6b0d5e2e..41480c5fcf6 100644 --- a/srcpkgs/xz/template +++ b/srcpkgs/xz/template @@ -1,14 +1,14 @@ # Template file for 'xz' pkgname=xz -version=5.1.2alpha +version=5.0.5 revision=1 build_style=gnu-configure short_desc="The XZ utilities" maintainer="Juan RP " license="Public domain, GPL-2, GPL-3, LGPL-2.1" homepage="http://tukani.org/xz" -distfiles="http://tukaani.org/xz/xz-${version}.tar.gz" -checksum=70e792d2a67cfbb8f2dffd0feab6ca6e5a4a618d65070fb44a367629d1ba94e5 +distfiles="http://tukaani.org/xz/xz-${version}.tar.bz2" +checksum=166c48d2842519bc4f96333bff9e265f8cdda44d38e40594ef3f9bbb52890490 liblzma_package() { short_desc="XZ-format compression library" @@ -33,6 +33,6 @@ liblzma-devel_package() { xz_package() { conflicts="chroot-xz>=0" pkg_install() { - vmove all + vmove usr } } From fd62404c7edc1fe4756daf7972a44edf18540736 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Fri, 27 Sep 2013 02:35:16 +0200 Subject: [PATCH 134/159] gnome-disk-utility: drop xz>=5.1 requirement. --- srcpkgs/gnome-disk-utility/template | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/srcpkgs/gnome-disk-utility/template b/srcpkgs/gnome-disk-utility/template index 61c62e0d9ac..46aa749861e 100644 --- a/srcpkgs/gnome-disk-utility/template +++ b/srcpkgs/gnome-disk-utility/template @@ -1,11 +1,11 @@ # Template file for 'gnome-disk-utility' pkgname=gnome-disk-utility version=3.9.0 -revision=1 +revision=2 build_style=gnu-configure configure_args="--disable-static" hostmakedepends="pkg-config intltool gnome-doc-utils" -makedepends="liblzma-devel>=5.1 gtk+3-devel libcanberra-devel udisks2-devel +makedepends="liblzma-devel gtk+3-devel libcanberra-devel udisks2-devel libdvdread-devel libsecret-devel libpwquality-devel systemd-devel gnome-settings-daemon-devel>=3.8 libnotify-devel" short_desc="GNOME libraries and applications for dealing with storage devices" @@ -15,8 +15,12 @@ license="GPL-2" distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" checksum=704bc3afc01c120a2651b8000f64f53308e6aaa5e155cda3700af27cd32d6f04 +pre_configure() { + sed -i -e 's/LIBLZMA_REQUIRED=5.1.0/LIBLZMA_REQUIRED=5.0.5/g' configure* +} + gnome-disk-utility_package() { - depends="liblzma>=5.1 hicolor-icon-theme desktop-file-utils" + depends="hicolor-icon-theme desktop-file-utils" pkg_install() { vmove all } From ea9a46eb071566182f4dc35bff775556c9963a69 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Fri, 27 Sep 2013 02:39:06 +0200 Subject: [PATCH 135/159] pycairo: update to 1.10 and switch to python3. --- srcpkgs/pycairo/template | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/srcpkgs/pycairo/template b/srcpkgs/pycairo/template index bd4001b1faa..a56e0b16b0a 100644 --- a/srcpkgs/pycairo/template +++ b/srcpkgs/pycairo/template @@ -1,20 +1,20 @@ # Template file for 'pycairo' pkgname=pycairo -version=1.8.8 -revision=8 -build_style=gnu-configure -hostmakedepends="pkg-config" -makedepends="cairo-devel python-devel" -short_desc="Python bindings for the cairo graphics library" +version=1.10.0 +revision=1 +build_style=waf3 +hostmakedepends="pkg-config which" +makedepends="cairo-devel python3-devel>=3.3.2_2" +short_desc="Python3 bindings for the cairo graphics library" homepage="http://cairographics.org/pycairo/" license="LGPL-3" maintainer="Juan RP " -distfiles="http://cairographics.org/releases/$pkgname-$version.tar.gz" -checksum=2f52599943ca03c8ff336a0e84b1c8b74f30e2a3de9cb6a9a42a93a848832860 +distfiles="http://cairographics.org/releases/$pkgname-$version.tar.bz2" +checksum=9aa4078e7eb5be583aeabbe8d87172797717f95e8c4338f0d4a17b683a7253be pycairo-devel_package() { depends="pycairo>=${version}" - short_desc+=" -- development files" + short_desc+=" - development files" pkg_install() { vmove usr/include vmove usr/lib/pkgconfig @@ -22,9 +22,7 @@ pycairo-devel_package() { } pycairo_package() { - depends="python" - pycompile_module="cairo" pkg_install() { - vmove usr + vmove all } } From 982c12285b1d3f7ab11a0aa3c721acc74bc4780e Mon Sep 17 00:00:00 2001 From: Juan RP Date: Fri, 27 Sep 2013 02:40:45 +0200 Subject: [PATCH 136/159] py2cairo: -devel pkg depends on python-devel. --- srcpkgs/py2cairo/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/py2cairo/template b/srcpkgs/py2cairo/template index 0068dfa6b1b..535ced88627 100644 --- a/srcpkgs/py2cairo/template +++ b/srcpkgs/py2cairo/template @@ -1,7 +1,7 @@ # Template file for 'py2cairo' pkgname=py2cairo version=1.10.0 -revision=1 +revision=2 build_style=waf hostmakedepends="pkg-config which" makedepends="cairo-devel python-devel" @@ -14,7 +14,7 @@ checksum=d30439f06c2ec1a39e27464c6c828b6eface3b22ee17b2de05dc409e429a7431 py2cairo-devel_package() { replaces="pycairo-devel<1.10" - depends="${sourcepkg}>=${version}" + depends="python-devel ${sourcepkg}>=${version}" short_desc+=" - development files" pkg_install() { vmove usr/include From b6c8cdff930815b0ba4aaf1d227a5b6aec21c1e0 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Fri, 27 Sep 2013 02:41:22 +0200 Subject: [PATCH 137/159] pycairo: -devel pkg depends on python-devel. --- srcpkgs/pycairo/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/pycairo/template b/srcpkgs/pycairo/template index a56e0b16b0a..d58aa00479a 100644 --- a/srcpkgs/pycairo/template +++ b/srcpkgs/pycairo/template @@ -1,7 +1,7 @@ # Template file for 'pycairo' pkgname=pycairo version=1.10.0 -revision=1 +revision=2 build_style=waf3 hostmakedepends="pkg-config which" makedepends="cairo-devel python3-devel>=3.3.2_2" @@ -13,7 +13,7 @@ distfiles="http://cairographics.org/releases/$pkgname-$version.tar.bz2" checksum=9aa4078e7eb5be583aeabbe8d87172797717f95e8c4338f0d4a17b683a7253be pycairo-devel_package() { - depends="pycairo>=${version}" + depends="python3-devel pycairo>=${version}" short_desc+=" - development files" pkg_install() { vmove usr/include From a66db21edf4cc2c435301cdf01f182c934968bb5 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Fri, 27 Sep 2013 02:47:40 +0200 Subject: [PATCH 138/159] pycairo: depend on a fixed python3 version. --- srcpkgs/pycairo/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/pycairo/template b/srcpkgs/pycairo/template index d58aa00479a..783c85f1406 100644 --- a/srcpkgs/pycairo/template +++ b/srcpkgs/pycairo/template @@ -1,7 +1,7 @@ # Template file for 'pycairo' pkgname=pycairo version=1.10.0 -revision=2 +revision=3 build_style=waf3 hostmakedepends="pkg-config which" makedepends="cairo-devel python3-devel>=3.3.2_2" @@ -13,7 +13,7 @@ distfiles="http://cairographics.org/releases/$pkgname-$version.tar.bz2" checksum=9aa4078e7eb5be583aeabbe8d87172797717f95e8c4338f0d4a17b683a7253be pycairo-devel_package() { - depends="python3-devel pycairo>=${version}" + depends="python3-devel>=3.3.2_2 pycairo>=${version}" short_desc+=" - development files" pkg_install() { vmove usr/include From d3e5be76fdc124b2eb4106ae1ce4dde133717555 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Fri, 27 Sep 2013 03:14:43 +0200 Subject: [PATCH 139/159] pygobject: added python3 bindings (py3gobject). --- common/shlibs | 4 +-- srcpkgs/py3gobject | 1 + srcpkgs/pygobject/template | 59 ++++++++++++++++++++++++++++++++------ 3 files changed, 54 insertions(+), 10 deletions(-) create mode 120000 srcpkgs/py3gobject diff --git a/common/shlibs b/common/shlibs index 68727e506f2..0e621205380 100644 --- a/common/shlibs +++ b/common/shlibs @@ -350,8 +350,8 @@ libnssdbm3.so nss-3.12.4_1 libnssckbi.so nss-3.12.4_1 libnss3.so nss-3.12.4_1 libcurl.so.4 libcurl-7.19_1 -libpyglib-gi-2.0-python.so.0 pygobject-2.27.0_1 -libpyglib-2.0-python.so.0 pygobject2-2.28.6_1 +libpyglib-gi-2.0-python.so.0 pygobject-3.10.0_2 +libpyglib-gi-2.0-python3.so.0 py3gobject-3.10.0_2 libdaemon.so.0 libdaemon-0.14_1 libavahi-common.so.3 avahi-libs-0.6.25_1 libavahi-core.so.7 avahi-libs-0.6.25_1 diff --git a/srcpkgs/py3gobject b/srcpkgs/py3gobject new file mode 120000 index 00000000000..3ce0c70e559 --- /dev/null +++ b/srcpkgs/py3gobject @@ -0,0 +1 @@ +pygobject \ No newline at end of file diff --git a/srcpkgs/pygobject/template b/srcpkgs/pygobject/template index 463d66606dd..e0373d1a568 100644 --- a/srcpkgs/pygobject/template +++ b/srcpkgs/pygobject/template @@ -1,10 +1,9 @@ # Template file for 'pygobject' pkgname=pygobject version=3.10.0 -revision=1 -build_style=gnu-configure -hostmakedepends="pkg-config gobject-introspection>=1.38" -makedepends="pycairo-devel libglib-devel python-devel" +revision=2 +hostmakedepends="which pkg-config gobject-introspection>=1.38" +makedepends="py2cairo-devel>=1.10.0_2 pycairo-devel>=1.10.0_3 libglib-devel" short_desc="Python bindings for GObject" homepage="http://www.pygtk.org/" license="LGPL-2.1" @@ -12,21 +11,65 @@ distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" maintainer="Juan RP " checksum=8aaa1f83fdb2e30bae77405a63a8be600b311a04a4cdc952b2ab62ee81aad077 +do_configure() { + # python2 + mkdir ${wrksrc}/build-python2 + cd ${wrksrc}/build-python2 + ../configure ${configure_args} --with-python=/usr/bin/python + + # python3 + mkdir ${wrksrc}/build-python3 + cd ${wrksrc}/build-python3 + ../configure ${configure_args} --with-python=/usr/bin/python3 +} + +do_build() { + # python2 + cd ${wrksrc}/build-python3 + make ${makejobs} + + # python3 + cd ${wrksrc}/build-python3 + make ${makejobs} +} + +do_install() { + # python2 + cd ${wrksrc}/build-python2 + make DESTDIR=${DESTDIR} install + + # python3 + cd ${wrksrc}/build-python3 + make DESTDIR=${DESTDIR}/python3 install +} + +py3gobject_package() { + short_desc="Python3 bindings for GObject" + pkg_install() { + vmkdir usr/lib + mv ${DESTDIR}/python3/usr/lib/*.so* ${PKGDESTDIR}/usr/lib + mv ${DESTDIR}/python3/usr/lib/python* ${PKGDESTDIR}/usr/lib + } +} + pygobject-devel_package() { - depends="libffi-devel libglib-devel libgirepository-devel - pycairo-devel ${sourcepkg}-${version}_${revision}" + depends="libgirepository-devel + py2cairo-devel>=1.10.0_2 + pycairo-devel>=1.10.0_2 + py3gobject>=${version}_${revision} + pygobject>=${version}_${revision}" short_desc+=" - development files" pkg_install() { vmove usr/include vmove usr/lib/pkgconfig - vmove "usr/lib/*.so" } } pygobject_package() { pycompile_module="gi pygtkcompat" - depends="python pycairo" + depends="py2cairo>=1.10.0_2" pkg_install() { + rm -rf ${DESTDIR}/python3 vmove all } } From abaf7213e7b82b9ebb34ef31b255df1ba89361b9 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Fri, 27 Sep 2013 03:29:58 +0200 Subject: [PATCH 140/159] dbus-python: update to 1.2.0; add python3 bindings. --- srcpkgs/dbus-python-devel | 1 + srcpkgs/dbus-python/template | 60 +++++++++++++++++++++++++++++++----- srcpkgs/dbus-python3 | 1 + 3 files changed, 54 insertions(+), 8 deletions(-) create mode 120000 srcpkgs/dbus-python-devel create mode 120000 srcpkgs/dbus-python3 diff --git a/srcpkgs/dbus-python-devel b/srcpkgs/dbus-python-devel new file mode 120000 index 00000000000..906753c2972 --- /dev/null +++ b/srcpkgs/dbus-python-devel @@ -0,0 +1 @@ +dbus-python \ No newline at end of file diff --git a/srcpkgs/dbus-python/template b/srcpkgs/dbus-python/template index f14461bed94..c963cab1ed7 100644 --- a/srcpkgs/dbus-python/template +++ b/srcpkgs/dbus-python/template @@ -1,26 +1,70 @@ # Template file for 'dbus-python' pkgname=dbus-python -version=1.1.0 +version=1.2.0 revision=1 -build_style=gnu-configure -makedepends="pkg-config dbus-devel glib-devel dbus-glib-devel python-devel" +hostmakedepends="pkg-config" +makedepends="glib-devel dbus-glib-devel python-devel python3-devel>=3.3.2_2" short_desc="D-Bus Python bindings" maintainer="Juan RP " license="GPL-2, LGPL-2.1" homepage="http://www.freedesktop.org/wiki/Software/DBusBindings" distfiles="http://dbus.freedesktop.org/releases/$pkgname/$pkgname-$version.tar.gz" -checksum=2dc30b53cdb2e20f8d0265af3be878e9da68745cf9ccc72f75de869094c4fc60 -long_desc=" - This package provides Python bindings for D-BUS." +checksum=e12c6c8b2bf3a9302f75166952cbe41d6b38c3441bbc6767dbd498942316c6df + +do_configure() { + mkdir build-python2 build-python3 + + cd $wrksrc/build-python2 + PYTHON=python2 ../configure --prefix=/usr + + cd $wrksrc/build-python3 + PYTHON=python3 ../configure --prefix=/usr +} + +do_build() { + cd $wrksrc/build-python2 + make ${makejobs} + + cd $wrksrc/build-python3 + make ${makejobs} +} + +do_install() { + cd $wrksrc/build-python2 + make DESTDIR=${DESTDIR} install + + cd $wrksrc/build-python3 + make DESTDIR=${DESTDIR}/python3 install -post_install() { rm -rf ${DESTDIR}/usr/share/doc } +dbus-python-devel_package() { + depends="python-devel + python3-devel>=3.3.2_2 + dbus-python>=${version} + dbus-python3>=${version}" + short_desc+=" - development files" + pkg_install() { + vmove usr/include + vmove usr/lib/pkgconfig + } +} + +dbus-python3_package() { + short_desc="D-Bus Python3 bindings" + depends="python3" + pkg_install() { + vmkdir usr/lib + mv ${DESTDIR}/python3/usr/lib/python3.3 ${PKGDESTDIR}/usr/lib + } +} + dbus-python_package() { pycompile_module="dbus" depends="python" pkg_install() { - vmove usr + rm -rf ${DESTDIR}/python3 + vmove all } } diff --git a/srcpkgs/dbus-python3 b/srcpkgs/dbus-python3 new file mode 120000 index 00000000000..906753c2972 --- /dev/null +++ b/srcpkgs/dbus-python3 @@ -0,0 +1 @@ +dbus-python \ No newline at end of file From e98c437aa40e4e7c6d9d132e86bc978dc99a5f62 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Fri, 27 Sep 2013 03:32:18 +0200 Subject: [PATCH 141/159] gnome-music: add missing python3 dependencies. --- srcpkgs/gnome-music/template | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/srcpkgs/gnome-music/template b/srcpkgs/gnome-music/template index 04c8f0e6622..0b22d308b04 100644 --- a/srcpkgs/gnome-music/template +++ b/srcpkgs/gnome-music/template @@ -1,10 +1,11 @@ # Template file for 'gnome-music' pkgname=gnome-music version=3.10.0 -revision=1 +revision=2 build_style=gnu-configure hostmakedepends="pkg-config intltool gobject-introspection" -makedepends="python3-devel grilo-devel gnome-desktop-devel>=3.10" +makedepends="python3-devel pygobject-devel>=3.10.0_2 dbus-python3>=1.2.0 + grilo-devel gnome-desktop-devel>=3.10" short_desc="GNOME music playing application" maintainer="Juan RP " homepage="http://live.gnome.org/Apps/Music" @@ -13,7 +14,7 @@ distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" checksum=16ecbb93f4e69a7e85b86fc73413744073d69edaa09e71e135afe2c8de5b1d69 gnome-music_package() { - depends="python3 desktop-file-utils" + depends="py3gobject dbus-python3 desktop-file-utils" pkg_install() { vmove all } From 2de7aa9199398415d60a26a4ab3ab1f71104e178 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Fri, 27 Sep 2013 03:40:13 +0200 Subject: [PATCH 142/159] gnome: update to 3.10.0. --- srcpkgs/gnome/template | 40 +++++++++++++++++++--------------------- 1 file changed, 19 insertions(+), 21 deletions(-) diff --git a/srcpkgs/gnome/template b/srcpkgs/gnome/template index 3ce1a7463b4..7190a108fa4 100644 --- a/srcpkgs/gnome/template +++ b/srcpkgs/gnome/template @@ -1,12 +1,11 @@ # Template file for 'gnome' pkgname=gnome -version=3.8.0 -revision=4 +version=3.10.0 +revision=1 build_style=meta makedepends=" gnome-backgrounds>=${version} gnome-themes-standard>=${version} - gnome-control-center>=${version} gnome-desktop>=${version} gnome-icon-theme>=${version} gnome-icon-theme-extras>=3.6.0 @@ -16,10 +15,10 @@ makedepends=" gnome-user-docs>=${version} gnome-shell>=${version} gnome-shell-extensions>=${version} - gnome-disk-utility>=${version} - gnome-dictionary>=3.6.0 + gnome-disk-utility>=3.9 + gnome-dictionary>=3.6 gnome-font-viewer>=${version} - gnome-system-log>=${version} + gnome-system-log>=3.9 gnome-screenshot>=${version} gnome-contacts>=${version} gnome-terminal>=${version} @@ -32,6 +31,11 @@ makedepends=" gnome-documents>=${version} gnome-photos>=${version} gnome-weather>=${version} + gnome-initial-setup>=${version} + gnome-maps>=${version} + gnome-online-miners>=${version} + gnome-music>=${version} + gnome-getting-started-docs>=${version} nautilus>=${version} yelp>=${version} epiphany>=${version} @@ -42,26 +46,23 @@ makedepends=" file-roller>=${version} seahorse>=${version} totem>=${version} - brasero>=${version} + brasero>=3.8 empathy>=${version} vino>=${version} vinagre>=${version} - network-manager-applet>=0.9.8 - cantarell-fonts>=0.0.12 - gucharmap>=${version} + gucharmap>=3.9 cheese>=${version} - nautilus-sendto>=${version} + nautilus-sendto>=3.8.1 evince>=${version} sushi>=${version} evolution>=${version} - rygel>=0.18.0 - tracker>=0.16.0 - eog-plugins>=${version} + eog-plugins>=3.8.1 seahorse-nautilus>=3.6.0 seahorse-sharing>=3.6.0 - NetworkManager - network-manager-applet - gnome-initial-setup>=0.10 + network-manager-applet>=0.9.8.4 + rygel>=0.20 + tracker>=0.16.2_2 + cantarell-fonts>=0.0.15 xdg-user-dirs-gtk" short_desc="The GNOME meta-package for Void Linux" maintainer="Juan RP " @@ -70,8 +71,5 @@ license="GPL, LGPL" gnome_package() { noarch="yes" - depends="${makedepends}" - pkg_install() { - vmove usr - } + depends="${_makedepends}" } From 61f95ce442fe910598e7b922b7b46e75413f2abe Mon Sep 17 00:00:00 2001 From: Juan RP Date: Fri, 27 Sep 2013 03:50:37 +0200 Subject: [PATCH 143/159] python3: remove conflicting file with python 2.7. --- srcpkgs/python3/template | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/srcpkgs/python3/template b/srcpkgs/python3/template index fafc7aff53e..980aaa82f4b 100644 --- a/srcpkgs/python3/template +++ b/srcpkgs/python3/template @@ -1,7 +1,7 @@ # Template build file for 'python3'. pkgname=python3 version=3.3.2 -revision=3 +revision=4 wrksrc="Python-${version}" short_desc="Interpreted, interactive, object-oriented programming language (3.x series)" maintainer="Juan RP " @@ -45,6 +45,8 @@ do_install() { make DESTDIR=${DESTDIR} install maninstall install -Dm644 LICENSE ${DESTDIR}/usr/share/licenses/${pkgname}/LICENSE + rm -f ${DESTDIR}/usr/bin/2to3 + ln -sf ../../libpython3.3m.so \ ${DESTDIR}/usr/lib/python3.3/config-3.3m/libpython3.3m.so } From ce7f23bd2d09bba366dd2cf7b3b61bdf0860d497 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Fri, 27 Sep 2013 03:52:51 +0200 Subject: [PATCH 144/159] gnome: fix typo. --- srcpkgs/gnome/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/gnome/template b/srcpkgs/gnome/template index 7190a108fa4..86384fbfa48 100644 --- a/srcpkgs/gnome/template +++ b/srcpkgs/gnome/template @@ -71,5 +71,5 @@ license="GPL, LGPL" gnome_package() { noarch="yes" - depends="${_makedepends}" + depends="${makedepends}" } From a9a246ecfa5f69f315dc7c1d730b33986a898b35 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Fri, 27 Sep 2013 08:18:05 +0200 Subject: [PATCH 145/159] gnome-bluetooth: add missing build-deps. --- srcpkgs/gnome-bluetooth/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/gnome-bluetooth/template b/srcpkgs/gnome-bluetooth/template index 54b25924a61..7ee7f6321c2 100644 --- a/srcpkgs/gnome-bluetooth/template +++ b/srcpkgs/gnome-bluetooth/template @@ -6,7 +6,7 @@ build_style=gnu-configure configure_args="--disable-desktop-update --disable-schemas-compile --disable-icon-update" hostmakedepends="which pkg-config intltool itstool gnome-doc-utils gobject-introspection" -makedepends="libXi-devel gtk+3-devel>=3.8 libnotify-devel" +makedepends="libXi-devel gtk+3-devel>=3.8 libnotify-devel dconf-devel>=0.18 gvfs-devel>=1.18 bluez-devel>=5" short_desc="The GNOME Bluetooth Subsystem" maintainer="Juan RP " homepage="http://live.gnome.org/GnomeBluetooth" From 6624e67d4ef3e5b19f1646361feabc064512f8b8 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Fri, 27 Sep 2013 08:56:06 +0200 Subject: [PATCH 146/159] gnome-bluetooth: fix wrong build-dep. --- srcpkgs/gnome-bluetooth/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/gnome-bluetooth/template b/srcpkgs/gnome-bluetooth/template index 7ee7f6321c2..c11f264fd35 100644 --- a/srcpkgs/gnome-bluetooth/template +++ b/srcpkgs/gnome-bluetooth/template @@ -6,7 +6,7 @@ build_style=gnu-configure configure_args="--disable-desktop-update --disable-schemas-compile --disable-icon-update" hostmakedepends="which pkg-config intltool itstool gnome-doc-utils gobject-introspection" -makedepends="libXi-devel gtk+3-devel>=3.8 libnotify-devel dconf-devel>=0.18 gvfs-devel>=1.18 bluez-devel>=5" +makedepends="libXi-devel gtk+3-devel>=3.8 libnotify-devel dconf-devel>=0.18 gvfs-devel>=1.18 bluez>=5" short_desc="The GNOME Bluetooth Subsystem" maintainer="Juan RP " homepage="http://live.gnome.org/GnomeBluetooth" From f9e85197fb71b73fb6bfc584b8f1b950313ec8ad Mon Sep 17 00:00:00 2001 From: Juan RP Date: Fri, 27 Sep 2013 08:57:41 +0200 Subject: [PATCH 147/159] gnome-tweak-tool: update to 3.10.0. --- srcpkgs/gnome-tweak-tool/template | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/srcpkgs/gnome-tweak-tool/template b/srcpkgs/gnome-tweak-tool/template index d60239d4b50..669304bfc3c 100644 --- a/srcpkgs/gnome-tweak-tool/template +++ b/srcpkgs/gnome-tweak-tool/template @@ -1,28 +1,29 @@ # Template file for 'gnome-tweak-tool' pkgname=gnome-tweak-tool -version=3.8.1 +version=3.10.0 revision=1 build_style=gnu-configure -depends="pygobject gsettings-desktop-schemas>=3.8" hostmakedepends="pkg-config intltool" -makedepends="pygobject-devel gsettings-desktop-schemas-devel>=3.6.0 - hicolor-icon-theme desktop-file-utils GConf" +makedepends="gtk+3-devel pygobject-devel>=3.10 gsettings-desktop-schemas-devel>=3.10 + hicolor-icon-theme desktop-file-utils GConf dconf>=0.18" short_desc="GNOME3 tool to customize advanced options" maintainer="Juan RP " license="GPL-2" homepage="http://live.gnome.org/GnomeTweakTool" -distfiles="${GNOME_SITE}/$pkgname/3.8/$pkgname-$version.tar.xz" -checksum=283e3174ce85aeb9187de31a09b59866e84debd31dcdddedc1615a5097ea54c1 -long_desc=" - The GNOME tweak tool includes an utility to customize advanced options that - are hidden by default in GNOME3." +distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" +checksum=6764b1cc609d347acc73a5aad431ff7e0edca5f3fbe409bab8ae12fff929c921 gnome-tweak-tool_package() { noarch="yes" pycompile_module="gtweak" - depends="pygobject gsettings-desktop-schemas>=3.8 - hicolor-icon-theme desktop-file-utils GConf" + depends="python + pygobject>=3.10 + gsettings-desktop-schemas>=3.10 + dconf>=0.18 + GConf + hicolor-icon-theme + desktop-file-utils" pkg_install() { - vmove usr + vmove all } } From 3ec845be94ee7422a05c1cbf0b4f37822168e5eb Mon Sep 17 00:00:00 2001 From: Juan RP Date: Fri, 27 Sep 2013 09:02:17 +0200 Subject: [PATCH 148/159] yelp: relax liblzma version requirement. --- srcpkgs/yelp/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/yelp/template b/srcpkgs/yelp/template index dc4ee345991..539ab5568e2 100644 --- a/srcpkgs/yelp/template +++ b/srcpkgs/yelp/template @@ -5,7 +5,7 @@ revision=1 build_style=gnu-configure configure_args="--disable-schemas-compile --disable-static" hostmakedepends="pkg-config intltool itstool" -makedepends="bzip2-devel liblzma-devel>=5.1 sqlite-devel libgpg-error-devel +makedepends="bzip2-devel liblzma-devel sqlite-devel libgpg-error-devel libgcrypt-devel libxslt-devel libsoup-devel>=2.44 webkitgtk-devel>=2.1 yelp-xsl>=${version}" short_desc="Help browser for GNOME desktop" From e5aeda245f8276948347281c456707d57e6c2ba5 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Fri, 27 Sep 2013 09:19:11 +0200 Subject: [PATCH 149/159] zeitgeist: update to 0.9.14. --- common/shlibs | 1 + srcpkgs/libzeitgeist2 | 1 + srcpkgs/zeitgeist-devel | 1 + srcpkgs/zeitgeist/template | 37 ++++++++++++++++++++++++++++--------- 4 files changed, 31 insertions(+), 9 deletions(-) create mode 120000 srcpkgs/libzeitgeist2 create mode 120000 srcpkgs/zeitgeist-devel diff --git a/common/shlibs b/common/shlibs index 0e621205380..0e0fd0d8854 100644 --- a/common/shlibs +++ b/common/shlibs @@ -1413,3 +1413,4 @@ libixml.so.2 libupnp-1.6.18_1 libupnp.so.6 libupnp-1.6.18_1 libmozjs-17.0.so mozjs17-17.0.0_1 libgeocode-glib.so.0 geocode-glib-3.10.0_1 +libzeitgeist-2.0.so.0 libzeitgeist2-0.9.14_1 diff --git a/srcpkgs/libzeitgeist2 b/srcpkgs/libzeitgeist2 new file mode 120000 index 00000000000..4f138a941b2 --- /dev/null +++ b/srcpkgs/libzeitgeist2 @@ -0,0 +1 @@ +zeitgeist \ No newline at end of file diff --git a/srcpkgs/zeitgeist-devel b/srcpkgs/zeitgeist-devel new file mode 120000 index 00000000000..4f138a941b2 --- /dev/null +++ b/srcpkgs/zeitgeist-devel @@ -0,0 +1 @@ +zeitgeist \ No newline at end of file diff --git a/srcpkgs/zeitgeist/template b/srcpkgs/zeitgeist/template index 429c78fbdf7..2c7a1cad034 100644 --- a/srcpkgs/zeitgeist/template +++ b/srcpkgs/zeitgeist/template @@ -1,16 +1,16 @@ # Template file for 'zeitgeist' pkgname=zeitgeist -version=0.9.5 +version=0.9.14 revision=1 build_style=gnu-configure -makedepends="pkg-config intltool python-devel vala-devel dbus-devel - raptor xapian-core-devel python-rdflib" +hostmakedepends="pkg-config intltool gobject-introspection" +makedepends="telepathy-glib-devel pygobject-devel>=3.10 vala-devel dbus-devel raptor xapian-core-devel python-rdflib" short_desc="logs the users’ activities and events" maintainer="Juan RP " homepage="http://zeitgeist-project.com" license="LGPL-2.1" -distfiles="https://launchpad.net/${pkgname}/${version%.*}/${version}/+download/${pkgname}-${version}.tar.bz2" -checksum=e5ccb75ff705bfb382750c520c29653b6e0f40aeacd30adf233162132114be55 +distfiles="https://launchpad.net/${pkgname}/${version%.*}/${version}/+download/${pkgname}-${version}.tar.xz" +checksum=769b5abfe67ef632414efa1d35a1462c5cd86c8792bb4635b4c3d93a5f15f061 long_desc=" Zeitgeist is a service which logs the users’ activities and events, anywhere from files opened to websites visited and conversations had. @@ -23,10 +23,29 @@ post_install() { rm -rf ${DESTDIR}/usr/doc } -zeitgeist_package() { - pycompile_module="zeitgeist" - depends="python>=2.7<3 dbus-python pygobject" +libzeitgeist2_package() { + short_desc+=" - shared library" pkg_install() { - vmove usr + vmove "usr/lib/*.so.*" + vmove usr/lib/girepository-1.0 + } +} +zeitgeist-devel_package() { + short_desc+=" - development files" + depends="libzeitgeist2>=${version}_${revision}" + pkg_install() { + vmove usr/include + vmove usr/lib/pkgconfig + vmove "usr/lib/*.so" + vmove usr/share/vala + vmove usr/share/gir-1.0 + } +} + +zeitgeist_package() { + pycompile_module="zeitgeist" + depends="python>=2.7<3 dbus-python pygobject>=3.10" + pkg_install() { + vmove all } } From 2b4b11225a1f057ee841e6aef25dad72fe8f3a62 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Fri, 27 Sep 2013 09:22:49 +0200 Subject: [PATCH 150/159] New package: bijiben-3.10.0. --- srcpkgs/bijiben/template | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 srcpkgs/bijiben/template diff --git a/srcpkgs/bijiben/template b/srcpkgs/bijiben/template new file mode 100644 index 00000000000..55e5886bf5f --- /dev/null +++ b/srcpkgs/bijiben/template @@ -0,0 +1,22 @@ +# Template file for 'bijiben' +pkgname=bijiben +version=3.10.0 +revision=1 +build_style=gnu-configure +hostmakedepends="pkg-config intltool itstool gobject-introspection" +makedepends="libuuid-devel webkitgtk-devel>=2.1.90 gnome-desktop-devel>=3.10 + gnome-online-accounts-devel>=3.10 tracker-devel>=0.16.2_2 + clutter-gtk-devel>=1.4.4_2 zeitgeist-devel>=0.9.14" +short_desc="Intuitive note editor with strong GNOME desktop integration" +maintainer="Juan RP " +homepage="http://live.gnome.org/Apps/Bijiben" +license="GPL-2" +distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" +checksum=82817151d7a69190944447bcc7cd12306160c2edce2d0e2ddbfd15ae2d2a6d10 + +bijiben_package() { + depends="zeitgeist>=0.9.14 desktop-file-utils" + pkg_install() { + vmove all + } +} From 4f00905c61cbdcc8b315d0847f0d7872fb5e4d16 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Fri, 27 Sep 2013 09:24:57 +0200 Subject: [PATCH 151/159] gnome: sort build-deps; add bijiben. --- srcpkgs/gnome/template | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/srcpkgs/gnome/template b/srcpkgs/gnome/template index 86384fbfa48..1be19bab767 100644 --- a/srcpkgs/gnome/template +++ b/srcpkgs/gnome/template @@ -13,8 +13,6 @@ makedepends=" gnome-session>=${version} gnome-settings-daemon>=${version} gnome-user-docs>=${version} - gnome-shell>=${version} - gnome-shell-extensions>=${version} gnome-disk-utility>=3.9 gnome-dictionary>=3.6 gnome-font-viewer>=${version} @@ -35,6 +33,8 @@ makedepends=" gnome-maps>=${version} gnome-online-miners>=${version} gnome-music>=${version} + gnome-shell>=${version} + gnome-shell-extensions>=${version} gnome-getting-started-docs>=${version} nautilus>=${version} yelp>=${version} @@ -56,6 +56,7 @@ makedepends=" evince>=${version} sushi>=${version} evolution>=${version} + bijiben>=${version} eog-plugins>=3.8.1 seahorse-nautilus>=3.6.0 seahorse-sharing>=3.6.0 From ee6c450fbf14883a14e365d8efa515b492e90fc3 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Fri, 27 Sep 2013 09:25:29 +0200 Subject: [PATCH 152/159] Add missing gnome-control-center-devel symlink. --- srcpkgs/gnome-control-center-devel | 1 + 1 file changed, 1 insertion(+) create mode 120000 srcpkgs/gnome-control-center-devel diff --git a/srcpkgs/gnome-control-center-devel b/srcpkgs/gnome-control-center-devel new file mode 120000 index 00000000000..7003bc1cf66 --- /dev/null +++ b/srcpkgs/gnome-control-center-devel @@ -0,0 +1 @@ +gnome-control-center \ No newline at end of file From 93e43da15c436d3c6cd232bcf360aee3ff45eaac Mon Sep 17 00:00:00 2001 From: Juan RP Date: Fri, 27 Sep 2013 09:32:22 +0200 Subject: [PATCH 153/159] bijiben: add missing build-deps. --- srcpkgs/bijiben/template | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/srcpkgs/bijiben/template b/srcpkgs/bijiben/template index 55e5886bf5f..c8701cbe217 100644 --- a/srcpkgs/bijiben/template +++ b/srcpkgs/bijiben/template @@ -4,7 +4,9 @@ version=3.10.0 revision=1 build_style=gnu-configure hostmakedepends="pkg-config intltool itstool gobject-introspection" -makedepends="libuuid-devel webkitgtk-devel>=2.1.90 gnome-desktop-devel>=3.10 +makedepends=" + json-glib-devel>=0.16.2 gtk+3-devel libuuid-devel + webkitgtk-devel>=2.1.90 gnome-desktop-devel>=3.10 gnome-online-accounts-devel>=3.10 tracker-devel>=0.16.2_2 clutter-gtk-devel>=1.4.4_2 zeitgeist-devel>=0.9.14" short_desc="Intuitive note editor with strong GNOME desktop integration" From f7b172c3b893b659203bfa2c37bc65d9d7e51ceb Mon Sep 17 00:00:00 2001 From: Juan RP Date: Fri, 27 Sep 2013 09:33:22 +0200 Subject: [PATCH 154/159] Revert "bijiben: add missing build-deps." This reverts commit 93e43da15c436d3c6cd232bcf360aee3ff45eaac. --- srcpkgs/bijiben/template | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/srcpkgs/bijiben/template b/srcpkgs/bijiben/template index c8701cbe217..55e5886bf5f 100644 --- a/srcpkgs/bijiben/template +++ b/srcpkgs/bijiben/template @@ -4,9 +4,7 @@ version=3.10.0 revision=1 build_style=gnu-configure hostmakedepends="pkg-config intltool itstool gobject-introspection" -makedepends=" - json-glib-devel>=0.16.2 gtk+3-devel libuuid-devel - webkitgtk-devel>=2.1.90 gnome-desktop-devel>=3.10 +makedepends="libuuid-devel webkitgtk-devel>=2.1.90 gnome-desktop-devel>=3.10 gnome-online-accounts-devel>=3.10 tracker-devel>=0.16.2_2 clutter-gtk-devel>=1.4.4_2 zeitgeist-devel>=0.9.14" short_desc="Intuitive note editor with strong GNOME desktop integration" From b77f1010789e6d5b6c344267bf31bbbdd1fa709e Mon Sep 17 00:00:00 2001 From: Juan RP Date: Fri, 27 Sep 2013 09:34:08 +0200 Subject: [PATCH 155/159] zeitgeist: add missing build-deps. --- srcpkgs/zeitgeist/template | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/srcpkgs/zeitgeist/template b/srcpkgs/zeitgeist/template index 2c7a1cad034..5278cdcc9b5 100644 --- a/srcpkgs/zeitgeist/template +++ b/srcpkgs/zeitgeist/template @@ -4,7 +4,10 @@ version=0.9.14 revision=1 build_style=gnu-configure hostmakedepends="pkg-config intltool gobject-introspection" -makedepends="telepathy-glib-devel pygobject-devel>=3.10 vala-devel dbus-devel raptor xapian-core-devel python-rdflib" +makedepends=" + json-glib-devel>=0.16.2 gtk+3-devel telepathy-glib-devel + pygobject-devel>=3.10 vala-devel dbus-devel raptor xapian-core-devel + python-rdflib" short_desc="logs the users’ activities and events" maintainer="Juan RP " homepage="http://zeitgeist-project.com" From 5cb819d75a9d44070cac0bdd7e7ece5a46777718 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Fri, 27 Sep 2013 10:10:57 +0200 Subject: [PATCH 156/159] Do not use sed in ${version}, x-r-c does not allow it. --- srcpkgs/dssi-vst/template | 2 +- srcpkgs/icu/template | 2 +- srcpkgs/nss/template | 2 +- srcpkgs/r2-bindings-git/template | 3 +-- 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/srcpkgs/dssi-vst/template b/srcpkgs/dssi-vst/template index d44ee3aedb4..3b3b3bee274 100644 --- a/srcpkgs/dssi-vst/template +++ b/srcpkgs/dssi-vst/template @@ -1,6 +1,6 @@ # Template file for 'dssi-vst' pkgname=dssi-vst -version="0.9.2.$(date -u +%Y%m%d)" +version=0.9.2.20130927 revision=1 makedepends="pkg-config jack-devel alsa-lib-devel liblo-devel dssi-devel ladspa-sdk wine-unstable wine-unstable-devel" diff --git a/srcpkgs/icu/template b/srcpkgs/icu/template index ae09988a306..f1ff73c3aaa 100644 --- a/srcpkgs/icu/template +++ b/srcpkgs/icu/template @@ -1,7 +1,7 @@ # Template build file for 'icu'. pkgname=icu version=49.1.2 -_distver="$(echo $version|sed -e 's|\.|_|g')" +_distver="49_1_2" revision=3 wrksrc=icu build_wrksrc=source diff --git a/srcpkgs/nss/template b/srcpkgs/nss/template index 5394d20029b..c3fd6dbdde8 100644 --- a/srcpkgs/nss/template +++ b/srcpkgs/nss/template @@ -1,7 +1,7 @@ # Template file for 'nss' pkgname=nss version=3.15.1 -_distver=$(echo $version|sed -e "s|\.|_|g") +_distver="3_15_1" revision=1 hostmakedepends="perl" makedepends="nspr-devel>=4.10 sqlite-devel" diff --git a/srcpkgs/r2-bindings-git/template b/srcpkgs/r2-bindings-git/template index b7ea7d8901f..2ba09d3f697 100644 --- a/srcpkgs/r2-bindings-git/template +++ b/srcpkgs/r2-bindings-git/template @@ -1,6 +1,6 @@ # Template file for 'r2-bindings-git' pkgname=r2-bindings-git -version="$(date -u +%Y%m%d)" +version=20130927 revision=1 short_desc="Advanced command line debugger and hexadecimal editor (bindings, git snapshot)" maintainer="Juan RP " @@ -14,7 +14,6 @@ long_desc=" This package contains the radare2 bindings for multiple languages." - makedepends="pkg-config swig>=2.0.7 valabind-git>=${version} python-devel radare2-devel-git>=${version}" From e8d29a6be99a0924b8259d8c52110d8c9d201fda Mon Sep 17 00:00:00 2001 From: Juan RP Date: Fri, 27 Sep 2013 10:18:41 +0200 Subject: [PATCH 157/159] gnome: depend on gnome-dictionary>=3.9. --- srcpkgs/gnome/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/gnome/template b/srcpkgs/gnome/template index 1be19bab767..18179fac466 100644 --- a/srcpkgs/gnome/template +++ b/srcpkgs/gnome/template @@ -14,7 +14,7 @@ makedepends=" gnome-settings-daemon>=${version} gnome-user-docs>=${version} gnome-disk-utility>=3.9 - gnome-dictionary>=3.6 + gnome-dictionary>=3.9 gnome-font-viewer>=${version} gnome-system-log>=3.9 gnome-screenshot>=${version} From 25793d83a3b1be7bb832cee51921ed3208b12f03 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Fri, 27 Sep 2013 10:21:39 +0200 Subject: [PATCH 158/159] empathy: depend on a newer telepathy-mission-control version. --- srcpkgs/empathy/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/empathy/template b/srcpkgs/empathy/template index fb03cf47897..c4945eb0782 100644 --- a/srcpkgs/empathy/template +++ b/srcpkgs/empathy/template @@ -1,7 +1,7 @@ # Template file for 'empathy' pkgname=empathy version=3.10.0 -revision=1 +revision=2 build_style=gnu-configure configure_args="--enable-gst-1.0=yes --disable-schemas-compile --disable-static" hostmakedepends="pkg-config intltool gnome-doc-utils itstool @@ -22,7 +22,7 @@ distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" checksum=5580bdba9faec0518b3328d5dc23f03dc0cf25ccf6c14902f306838c23d5918f empathy_package() { - depends="gsettings-desktop-schemas>=3.10 geoclue2 iso-codes" + depends="telepathy-mission-control>=5.15 gsettings-desktop-schemas>=3.10 geoclue2 iso-codes" pkg_install() { vmove all } From b4ffb772ceac8983dcc5040045989ee83ecf0aaf Mon Sep 17 00:00:00 2001 From: Juan RP Date: Fri, 27 Sep 2013 10:22:27 +0200 Subject: [PATCH 159/159] empathy: depend on a newer telepathy-mission-control version (v2). --- srcpkgs/empathy/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/empathy/template b/srcpkgs/empathy/template index c4945eb0782..2fc0f38f300 100644 --- a/srcpkgs/empathy/template +++ b/srcpkgs/empathy/template @@ -9,7 +9,7 @@ hostmakedepends="pkg-config intltool gnome-doc-utils itstool makedepends=" libcanberra-devel clutter-gst-devel>=2.0.8_2 clutter-gtk-devel>=1.4.4_2 telepathy-glib-devel>=0.19.9 telepathy-logger-devel>=0.8 libnotify-devel - telepathy-farstream-devel>=0.6.0 telepathy-mission-control-devel>=5.14 + telepathy-farstream-devel>=0.6.0 telepathy-mission-control-devel>=5.15 evolution-data-server-devel>=3.10 geocode-glib-devel folks-devel>=0.9.5 webkitgtk-devel>=2.1 libgudev-devel pulseaudio-devel cheese-devel>=3.10 enchant-devel NetworkManager-devel libchamplain-devel>=0.12.5_2