sword: gcc visibility fixes, closes #2196

- patch to make certain inlines, hidden by -fvisibility-hidden-inlines, back visible.

diff --git a/packages/sword/sword-1.5.9/.mtn2git_empty b/packages/sword/sword-1.5.9/.mtn2git_empty
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/packages/sword/sword-1.5.9/gcc-visibility.patch b/packages/sword/sword-1.5.9/gcc-visibility.patch
new file mode 100644 (file)
index 0000000..f23a667
--- /dev/null
+++ b/packages/sword/sword-1.5.9/gcc-visibility.patch
@@ -0,0 +1,26 @@
+diff --git a/include/rawtext.h b/include/rawtext.h
+index 32986fe..1304bf7 100644
+--- a/include/rawtext.h
++++ b/include/rawtext.h
+@@ -43,7 +43,7 @@ public:
+       virtual ~RawText();
+       virtual SWBuf &getRawEntryBuf();
+       virtual void increment(int steps = 1);
+-      virtual void decrement(int steps = 1) { increment(-steps); }
++      virtual __attribute__((visibility("default"))) void decrement(int steps = 1) { increment(-steps); }
+       virtual signed char createSearchFramework(
+                       void (*percent) (char, void *) = &nullPercent,
+                       void *percentUserData = 0);
+diff --git a/include/versekey.h b/include/versekey.h
+index 0ca5e47..53084d9 100644
+--- a/include/versekey.h
++++ b/include/versekey.h
+@@ -253,7 +253,7 @@ public:
+       */
+       virtual const char *getText() const;
+       virtual const char *getShortText() const;
+-      virtual void setText(const char *ikey) { SWKey::setText(ikey); parse (); }
++      virtual __attribute__((visibility("default"))) void setText(const char *ikey) { SWKey::setText(ikey); parse (); }
+       virtual void copyFrom(const SWKey &ikey);
+       
+       /** Equates this VerseKey to another VerseKey

diff --git a/packages/sword/sword_1.5.9.bb b/packages/sword/sword_1.5.9.bb
index 362b75e..2c180ac 100644 (file)
--- a/packages/sword/sword_1.5.9.bb
+++ b/packages/sword/sword_1.5.9.bb
@@ -7,7 +7,8 @@ PRIORITY = "optional"
 LICENSE = "GPL"
 PR = "r0"
 
-SRC_URI = "http://www.crosswire.org/ftpmirror/pub/sword/source/v1.5/sword-${PV}.tar.gz"
+SRC_URI = "http://www.crosswire.org/ftpmirror/pub/sword/source/v1.5/sword-${PV}.tar.gz \
+       file://gcc-visibility.patch;patch=1"
 
 inherit autotools pkgconfig