[arch-commits] Commit in empathy/repos/staging-x86_64 (4 files)
Jan Steffens
heftig at archlinux.org
Thu Jan 18 09:24:34 UTC 2018
Date: Thursday, January 18, 2018 @ 09:24:27
Author: heftig
Revision: 315041
archrelease: copy trunk to staging-x86_64
Added:
empathy/repos/staging-x86_64/PKGBUILD
(from rev 315040, empathy/trunk/PKGBUILD)
empathy/repos/staging-x86_64/enchant-2.patch
(from rev 315040, empathy/trunk/enchant-2.patch)
Deleted:
empathy/repos/staging-x86_64/PKGBUILD
empathy/repos/staging-x86_64/enchant-2.patch
-----------------+
PKGBUILD | 119 ++++++++++++++++++++++++++----------------------------
enchant-2.patch | 78 +++++++++++++++++------------------
2 files changed, 98 insertions(+), 99 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2018-01-18 09:22:29 UTC (rev 315040)
+++ PKGBUILD 2018-01-18 09:24:27 UTC (rev 315041)
@@ -1,60 +0,0 @@
-# $Id$
-# Contributor: Ionut Biru <ibiru at archlinux.org>
-
-pkgname=empathy
-pkgver=3.25.90+34+g78f4d4fda
-pkgrel=2
-pkgdesc="A GNOME instant messaging client using the Telepathy framework"
-url="https://wiki.gnome.org/Apps/Empathy"
-arch=(x86_64)
-license=(GPL2)
-depends=(clutter-gst clutter-gtk folks gcr iso-codes libcanberra libpulse webkit2gtk
- telepathy-farstream telepathy-glib telepathy-logger telepathy-mission-control geoclue2
- geocode-glib cheese libchamplain libgudev)
-makedepends=(intltool itstool docbook-xsl python gnome-common git)
-optdepends=('telepathy-gabble: XMPP/Jabber support'
- 'telepathy-idle: IRC support'
- 'telepathy-salut: Link-local XMPP support'
- 'telepathy-haze: libpurple support')
-groups=(gnome)
-_commit=78f4d4fdadd7da67e063c2905649f6a6015ef8f9 # master
-source=("git+https://git.gnome.org/browse/empathy#commit=$_commit"
- "git+https://git.gnome.org/browse/telepathy-account-widgets"
- enchant-2.patch)
-sha256sums=('SKIP'
- 'SKIP'
- 'f177f0dfc242018dd52e312637f513fd08f64aa991b45930cc3ea9a2576f795e')
-
-pkgver() {
- cd $pkgname
- git describe --tags | sed 's/^EMPATHY_//;s/_/./g;s/-/+/g'
-}
-
-prepare() {
- cd $pkgname
-
- git submodule init
- git config --local submodule.telepathy-account-widgets.url "$srcdir/telepathy-account-widgets"
- git submodule update
-
- patch -Np1 -i ../enchant-2.patch
-
- NOCONFIGURE=1 ./autogen.sh
-}
-
-build() {
- cd $pkgname
- export LANG=en_US.UTF-8 LC_ALL=en_US.UTF-8
- ./configure --prefix=/usr \
- --sysconfdir=/etc \
- --libexecdir=/usr/lib/empathy \
- --disable-static \
- --disable-Werror
- sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
- make
-}
-
-package() {
- cd $pkgname
- make DESTDIR="$pkgdir" install
-}
Copied: empathy/repos/staging-x86_64/PKGBUILD (from rev 315040, empathy/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2018-01-18 09:24:27 UTC (rev 315041)
@@ -0,0 +1,59 @@
+# $Id$
+# Contributor: Ionut Biru <ibiru at archlinux.org>
+
+pkgname=empathy
+pkgver=3.25.90+34+g78f4d4fda
+pkgrel=3
+pkgdesc="A GNOME instant messaging client using the Telepathy framework"
+url="https://wiki.gnome.org/Apps/Empathy"
+arch=(x86_64)
+license=(GPL2)
+depends=(clutter-gst clutter-gtk folks gcr iso-codes libcanberra libpulse webkit2gtk
+ telepathy-farstream telepathy-glib telepathy-logger telepathy-mission-control geoclue2
+ geocode-glib cheese libchamplain libgudev)
+makedepends=(intltool itstool docbook-xsl python gnome-common git)
+optdepends=('telepathy-gabble: XMPP/Jabber support'
+ 'telepathy-idle: IRC support'
+ 'telepathy-salut: Link-local XMPP support'
+ 'telepathy-haze: libpurple support')
+_commit=78f4d4fdadd7da67e063c2905649f6a6015ef8f9 # master
+source=("git+https://git.gnome.org/browse/empathy#commit=$_commit"
+ "git+https://git.gnome.org/browse/telepathy-account-widgets"
+ enchant-2.patch)
+sha256sums=('SKIP'
+ 'SKIP'
+ 'f177f0dfc242018dd52e312637f513fd08f64aa991b45930cc3ea9a2576f795e')
+
+pkgver() {
+ cd $pkgname
+ git describe --tags | sed 's/^EMPATHY_//;s/_/./g;s/-/+/g'
+}
+
+prepare() {
+ cd $pkgname
+
+ git submodule init
+ git config --local submodule.telepathy-account-widgets.url "$srcdir/telepathy-account-widgets"
+ git submodule update
+
+ patch -Np1 -i ../enchant-2.patch
+
+ NOCONFIGURE=1 ./autogen.sh
+}
+
+build() {
+ cd $pkgname
+ export LANG=en_US.UTF-8 LC_ALL=en_US.UTF-8
+ ./configure --prefix=/usr \
+ --sysconfdir=/etc \
+ --libexecdir=/usr/lib/empathy \
+ --disable-static \
+ --disable-Werror
+ sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
+ make
+}
+
+package() {
+ cd $pkgname
+ make DESTDIR="$pkgdir" install
+}
Deleted: enchant-2.patch
===================================================================
--- enchant-2.patch 2018-01-18 09:22:29 UTC (rev 315040)
+++ enchant-2.patch 2018-01-18 09:24:27 UTC (rev 315041)
@@ -1,39 +0,0 @@
- configure.ac | 4 ++--
- libempathy-gtk/empathy-spell.c | 2 +-
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git c/configure.ac i/configure.ac
-index 7aeb6b31c..31e5b847b 100644
---- c/configure.ac
-+++ i/configure.ac
-@@ -72,7 +72,7 @@ WEBKIT_REQUIRED=2.10.0
- GOA_REQUIRED=3.5.1
-
- # Optional deps
--ENCHANT_REQUIRED=1.2.0
-+ENCHANT_REQUIRED=2.2.0
- GEOCLUE_REQUIRED=2.1.0
- GEOCODE_GLIB_REQUIRED=0.99.1
- ISO_CODES_REQUIRED=0.35
-@@ -307,7 +307,7 @@ AC_ARG_ENABLE(spell,
- if test "x$enable_spell" != "xno"; then
- PKG_CHECK_MODULES(ENCHANT,
- [
-- enchant >= $ENCHANT_REQUIRED,
-+ enchant-2 >= $ENCHANT_REQUIRED,
- iso-codes >= $ISO_CODES_REQUIRED
- ], have_enchant="yes", have_enchant="no")
-
-diff --git c/libempathy-gtk/empathy-spell.c i/libempathy-gtk/empathy-spell.c
-index 27f27f902..bb0159fd8 100644
---- c/libempathy-gtk/empathy-spell.c
-+++ i/libempathy-gtk/empathy-spell.c
-@@ -424,7 +424,7 @@ empathy_spell_add_to_dictionary (const gchar *code,
- if (lang == NULL)
- return;
-
-- enchant_dict_add_to_pwl (lang->speller, word, strlen (word));
-+ enchant_dict_add (lang->speller, word, strlen (word));
- }
-
- #else /* not HAVE_ENCHANT */
Copied: empathy/repos/staging-x86_64/enchant-2.patch (from rev 315040, empathy/trunk/enchant-2.patch)
===================================================================
--- enchant-2.patch (rev 0)
+++ enchant-2.patch 2018-01-18 09:24:27 UTC (rev 315041)
@@ -0,0 +1,39 @@
+ configure.ac | 4 ++--
+ libempathy-gtk/empathy-spell.c | 2 +-
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git c/configure.ac i/configure.ac
+index 7aeb6b31c..31e5b847b 100644
+--- c/configure.ac
++++ i/configure.ac
+@@ -72,7 +72,7 @@ WEBKIT_REQUIRED=2.10.0
+ GOA_REQUIRED=3.5.1
+
+ # Optional deps
+-ENCHANT_REQUIRED=1.2.0
++ENCHANT_REQUIRED=2.2.0
+ GEOCLUE_REQUIRED=2.1.0
+ GEOCODE_GLIB_REQUIRED=0.99.1
+ ISO_CODES_REQUIRED=0.35
+@@ -307,7 +307,7 @@ AC_ARG_ENABLE(spell,
+ if test "x$enable_spell" != "xno"; then
+ PKG_CHECK_MODULES(ENCHANT,
+ [
+- enchant >= $ENCHANT_REQUIRED,
++ enchant-2 >= $ENCHANT_REQUIRED,
+ iso-codes >= $ISO_CODES_REQUIRED
+ ], have_enchant="yes", have_enchant="no")
+
+diff --git c/libempathy-gtk/empathy-spell.c i/libempathy-gtk/empathy-spell.c
+index 27f27f902..bb0159fd8 100644
+--- c/libempathy-gtk/empathy-spell.c
++++ i/libempathy-gtk/empathy-spell.c
+@@ -424,7 +424,7 @@ empathy_spell_add_to_dictionary (const gchar *code,
+ if (lang == NULL)
+ return;
+
+- enchant_dict_add_to_pwl (lang->speller, word, strlen (word));
++ enchant_dict_add (lang->speller, word, strlen (word));
+ }
+
+ #else /* not HAVE_ENCHANT */
More information about the arch-commits
mailing list