summaryrefslogtreecommitdiff
path: root/packages
diff options
context:
space:
mode:
authorAvatar Marc-Antoine Perennou <keruspe@exherbo.org> 2018-01-16 20:31:10 +0000
committerAvatar Marc-Antoine Perennou <keruspe@exherbo.org> 2018-01-16 20:31:10 +0000
commit07a89155ef75217a4e5d658705d5693524ae2c1d (patch)
treed6be78c8aead67341846b0e676414915a340fc91 /packages
parent2fecdff0184766e0dfb05946123a2329031a7191 (diff)
parent8da0d792bedf5ec3eb0b8676204070a6d6f49230 (diff)
downloadgnome-master.tar.gz
gnome-master.tar.xz
Merge branch 'gnome-bump' into 'master'HEADmaster
json-glib: version bump to 1.4.2 See merge request exherbo/gnome!14
Diffstat (limited to 'packages')
-rw-r--r--packages/core/json-glib/json-glib-1.4.2.exheres-0 (renamed from packages/core/json-glib/json-glib-1.2.8.exheres-0)7
-rw-r--r--packages/gnome-desktop/evolution-data-server/evolution-data-server-3.26.4.exheres-0 (renamed from packages/gnome-desktop/evolution-data-server/evolution-data-server-3.26.3.exheres-0)0
-rw-r--r--packages/gnome-desktop/librsvg/librsvg-2.40.20.exheres-016
-rw-r--r--packages/gnome-desktop/librsvg/librsvg-2.42.0.exheres-0 (renamed from packages/gnome-desktop/librsvg/librsvg-2.41.2.exheres-0)0
-rw-r--r--packages/gnome-desktop/librsvg/librsvg.exlib17
-rw-r--r--packages/gnome-desktop/libsoup/libsoup-2.60.3.exheres-0 (renamed from packages/gnome-desktop/libsoup/libsoup-2.60.0.exheres-0)8
-rw-r--r--packages/mail-client/evolution/evolution-3.26.4.exheres-0 (renamed from packages/mail-client/evolution/evolution-3.26.3.exheres-0)0
7 files changed, 13 insertions, 35 deletions
diff --git a/packages/core/json-glib/json-glib-1.2.8.exheres-0 b/packages/core/json-glib/json-glib-1.4.2.exheres-0
index be04054..b9bd0f2 100644
--- a/packages/core/json-glib/json-glib-1.2.8.exheres-0
+++ b/packages/core/json-glib/json-glib-1.4.2.exheres-0
@@ -13,13 +13,16 @@ MYOPTIONS="gobject-introspection gtk-doc"
DEPENDENCIES="
build:
+ sys-devel/gettext
virtual/pkg-config[>=0.20]
gobject-introspection? ( gnome-desktop/gobject-introspection[>=0.9.5] )
- gtk-doc? ( dev-doc/gtk-doc[>=1.20] )
+ gtk-doc? (
+ dev-doc/gtk-doc[>=1.20]
+ dev-libs/libxslt
+ )
build+run:
dev-libs/glib:2[>=2.44.0]
"
MESON_SRC_CONFIGURE_OPTION_ENABLES=( 'gobject-introspection introspection' 'gtk-doc' )
-MESON_SRC_CONFIGURE_PARAMS=( '-Denable-man=true' )
diff --git a/packages/gnome-desktop/evolution-data-server/evolution-data-server-3.26.3.exheres-0 b/packages/gnome-desktop/evolution-data-server/evolution-data-server-3.26.4.exheres-0
index e312e24..e312e24 100644
--- a/packages/gnome-desktop/evolution-data-server/evolution-data-server-3.26.3.exheres-0
+++ b/packages/gnome-desktop/evolution-data-server/evolution-data-server-3.26.4.exheres-0
diff --git a/packages/gnome-desktop/librsvg/librsvg-2.40.20.exheres-0 b/packages/gnome-desktop/librsvg/librsvg-2.40.20.exheres-0
deleted file mode 100644
index 978d344..0000000
--- a/packages/gnome-desktop/librsvg/librsvg-2.40.20.exheres-0
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 2011 Brett Witherspoon <spoonb@exherbo.org>
-# Distributed under the terms of the GNU General Public License v2
-
-require librsvg
-
-PLATFORMS="~amd64 ~x86"
-
-src_prepare() {
- default
-
- # Remove failing test
- # https://bugzilla.gnome.org/show_bug.cgi?id=788836
- edo rm tests/fixtures/reftests/bugs/777834-empty-text-children-ref.png
- edo rm tests/fixtures/reftests/bugs/777834-empty-text-children.svg
-}
-
diff --git a/packages/gnome-desktop/librsvg/librsvg-2.41.2.exheres-0 b/packages/gnome-desktop/librsvg/librsvg-2.42.0.exheres-0
index 01017a4..01017a4 100644
--- a/packages/gnome-desktop/librsvg/librsvg-2.41.2.exheres-0
+++ b/packages/gnome-desktop/librsvg/librsvg-2.42.0.exheres-0
diff --git a/packages/gnome-desktop/librsvg/librsvg.exlib b/packages/gnome-desktop/librsvg/librsvg.exlib
index d0648ca..f9776d4 100644
--- a/packages/gnome-desktop/librsvg/librsvg.exlib
+++ b/packages/gnome-desktop/librsvg/librsvg.exlib
@@ -2,7 +2,7 @@
# Copyright 2011 Brett Witherspoon <spoonb@exherbo.org>
# Distributed under the terms of the GNU General Public License v2
-ever at_least 2.41 && require cargo
+require cargo
require gnome.org [ suffix=tar.xz ]
require autotools [ supported_autoconf=[ 2.5 ] supported_automake=[ 1.15 ] ]
require vala [ with_opt=true ]
@@ -23,10 +23,9 @@ MYOPTIONS="
DEPENDENCIES="
build:
virtual/pkg-config[>=0.18]
- gnome-desktop/gobject-introspection:1[>=0.10.8] [[ note = [ for m4 ] ]]
gtk-doc? ( dev-doc/gtk-doc[>=1.13] )
build+run:
- dev-libs/glib:2[>=2.24.0]
+ dev-libs/glib:2[>=2.52.0]
dev-libs/libcroco[>=0.6.1]
dev-libs/libxml2:2.0[>=2.9]
media-libs/fontconfig
@@ -55,18 +54,14 @@ DEFAULT_SRC_CONFIGURE_OPTION_ENABLES=(
librsvg_src_unpack() {
default
- if ever at_least 2.41; then
- edo cd "${WORK}"/rust
- ecargo_fetch
- fi
+ edo cd "${WORK}"/rust
+ ecargo_fetch
}
librsvg_src_configure() {
default
- if ever at_least 2.41; then
- edo cd "${WORK}"/rust
- ecargo_config
- fi
+ edo cd "${WORK}"/rust
+ ecargo_config
}
librsvg_src_compile() {
diff --git a/packages/gnome-desktop/libsoup/libsoup-2.60.0.exheres-0 b/packages/gnome-desktop/libsoup/libsoup-2.60.3.exheres-0
index bbf0143..38ca754 100644
--- a/packages/gnome-desktop/libsoup/libsoup-2.60.0.exheres-0
+++ b/packages/gnome-desktop/libsoup/libsoup-2.60.3.exheres-0
@@ -1,7 +1,7 @@
# Copyright 2008 Saleem Abdulrasool <compnerd@compnerd.org>
# Distributed under the terms of the GNU General Public License v2
-require gnome.org [ suffix=tar.xz ] autotools [ supported_autoconf=[ 2.5 ] supported_automake=[ 1.15 ] ]
+require gnome.org [ suffix=tar.xz ]
require vala [ vala_dep=true with_opt=true option_name=vapi ]
SUMMARY="HTTP library implemented in C"
@@ -24,7 +24,7 @@ DEPENDENCIES="
dev-util/intltool[>=0.35.0]
sys-devel/gettext
virtual/pkg-config[>=0.20]
- gtk-doc? ( dev-doc/gtk-doc[>=1.10] )
+ gtk-doc? ( dev-doc/gtk-doc[>=1.20] )
build+run:
dev-db/sqlite:3
dev-libs/glib:2[>=2.38.0]
@@ -55,7 +55,3 @@ DEFAULT_SRC_CONFIGURE_OPTION_ENABLES=(
'vapi vala'
)
-src_prepare() {
- autotools_src_prepare
- edo intltoolize --force --automake
-}
diff --git a/packages/mail-client/evolution/evolution-3.26.3.exheres-0 b/packages/mail-client/evolution/evolution-3.26.4.exheres-0
index bba51d7..bba51d7 100644
--- a/packages/mail-client/evolution/evolution-3.26.3.exheres-0
+++ b/packages/mail-client/evolution/evolution-3.26.4.exheres-0