app-text/liblangtag: fix broken enum declaration, bug #588966
authorSergei Trofimovich <slyfox@gentoo.org>
Sun, 17 Jul 2016 07:37:51 +0000 (08:37 +0100)
committerSergei Trofimovich <slyfox@gentoo.org>
Sun, 17 Jul 2016 07:39:23 +0000 (08:39 +0100)
Reported-by: Cynede
Bug: https://bugs.gentoo.org/588966

Package-Manager: portage-2.3.0

app-text/liblangtag/files/liblangtag-0.6.0-enum.patch [new file with mode: 0644]
app-text/liblangtag/liblangtag-0.6.0-r1.ebuild [moved from app-text/liblangtag/liblangtag-0.6.0.ebuild with 95% similarity]

diff --git a/app-text/liblangtag/files/liblangtag-0.6.0-enum.patch b/app-text/liblangtag/files/liblangtag-0.6.0-enum.patch
new file mode 100644 (file)
index 0000000..59265a5
--- /dev/null
@@ -0,0 +1,56 @@
+From 3cc56cf32c006e7e8445c3ba49ffc128c646c88d Mon Sep 17 00:00:00 2001
+From: David Tardon <dtardon@redhat.com>
+Date: Wed, 23 Mar 2016 14:07:48 +0100
+Subject: [PATCH] enum must be declared before it's used
+
+---
+ liblangtag/lt-tag.h | 26 +++++++++++++-------------
+ 1 file changed, 13 insertions(+), 13 deletions(-)
+
+diff --git a/liblangtag/lt-tag.h b/liblangtag/lt-tag.h
+index 939acf5..78e3797 100644
+--- a/liblangtag/lt-tag.h
++++ b/liblangtag/lt-tag.h
+@@ -37,6 +37,19 @@ LT_BEGIN_DECLS
+  */
+ typedef struct _lt_tag_t      lt_tag_t;
++enum _lt_tag_filter_t {
++      LT_TAG_FILTER_NONE          = 0,
++      LT_TAG_FILTER_LANGUAGE      = 1 << 0,
++      LT_TAG_FILTER_EXTLANG       = 1 << 1,
++      LT_TAG_FILTER_SCRIPT        = 1 << 2,
++      LT_TAG_FILTER_REGION        = 1 << 3,
++      LT_TAG_FILTER_VARIANT       = 1 << 4,
++      LT_TAG_FILTER_EXTENSION     = 1 << 5,
++      LT_TAG_FILTER_PRIVATEUSE    = 1 << 6,
++      LT_TAG_FILTER_GRANDFATHERED = 1 << 7,
++      LT_TAG_FILTER_ALL           = -1
++};
++
+ /**
+  * lt_tag_filter_t:
+  * @LT_TAG_FILTER_NONE: all of objects filtered.
+@@ -55,19 +68,6 @@ typedef struct _lt_tag_t    lt_tag_t;
+  */
+ typedef enum _lt_tag_filter_t lt_tag_filter_t;
+-enum _lt_tag_filter_t {
+-      LT_TAG_FILTER_NONE          = 0,
+-      LT_TAG_FILTER_LANGUAGE      = 1 << 0,
+-      LT_TAG_FILTER_EXTLANG       = 1 << 1,
+-      LT_TAG_FILTER_SCRIPT        = 1 << 2,
+-      LT_TAG_FILTER_REGION        = 1 << 3,
+-      LT_TAG_FILTER_VARIANT       = 1 << 4,
+-      LT_TAG_FILTER_EXTENSION     = 1 << 5,
+-      LT_TAG_FILTER_PRIVATEUSE    = 1 << 6,
+-      LT_TAG_FILTER_GRANDFATHERED = 1 << 7,
+-      LT_TAG_FILTER_ALL           = -1
+-};
+-
+ lt_tag_t                 *lt_tag_new                         (void);
+ lt_tag_t                 *lt_tag_ref                         (lt_tag_t       *tag);
+ void                      lt_tag_unref                       (lt_tag_t       *tag);
+-- 
+2.7.4.1.g5468f9e
+
similarity index 95%
rename from app-text/liblangtag/liblangtag-0.6.0.ebuild
rename to app-text/liblangtag/liblangtag-0.6.0-r1.ebuild
index c431d7c9734c3b30599a208498d53ae6676fd12a..2e7c4c1283fcfa3943eb2fa7038b0621467cd89a 100644 (file)
@@ -28,6 +28,8 @@ DEPEND="${RDEPEND}
 # Upstream expect liblangtag to be installed when one runs tests...
 RESTRICT="test"
 
+PATCHES=("${FILESDIR}"/${P}-enum.patch)
+
 src_configure() {
        econf \
                $(use_enable introspection) \