Subject: [alpine-aports] [PATCH] testing/xiphos: update to 4.0.3

From: Isaac Dunham <[email-masked]>
Date: Sat, 8 Aug 2015 22:28:23 -0700

---
 testing/xiphos/APKBUILD | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/testing/xiphos/APKBUILD b/testing/xiphos/APKBUILD
index bbc8fbd..eba2df8 100644
--- a/testing/xiphos/APKBUILD
+++ b/testing/xiphos/APKBUILD
@@ -1,9 +1,9 @@
 # Contributor: Isaac Dunham <[email-masked]>
 # Maintainer: Isaac Dunham <[email-masked]>
 pkgname=xiphos
-pkgver=4.0.2
+pkgver=4.0.3
 pkgrel=0
-_pkgex="-20150415"
+_pkgex="-20150806"
 pkgdesc="Gnome application for Bible study"
 url="https://sourceforge.net/projects/gnomesword"
 arch="all"
@@ -39,6 +39,6 @@ package() {
 
 }
 
-md5sums="d5151d06bc701c82f9a1fa7f81214fe1  xiphos-4.0.2-20150415.tar.gz"
-sha256sums="dc472085dcd707426a5b6642e203bd3e711b4a04e03d5053aa712fa4eb341365  xiphos-4.0.2-20150415.tar.gz"
-sha512sums="d69b80cc4997b8aec3d05326741415498ca650205fab6ec262f83bc837878ed6272a10c954d04516cf6423ff5ce1f5372b8b82b11f0ed6d9dacfab6d304e7e05  xiphos-4.0.2-20150415.tar.gz"
+md5sums="90862930461bdb13893a2af23467e542  xiphos-4.0.3-20150806.tar.gz"
+sha256sums="1bc76b09ee729ad446f0dcfa0b0394997c54c2b79f1c046e16aad1a6d5857bf6  xiphos-4.0.3-20150806.tar.gz"
+sha512sums="d32ed1121c07eda65e851fce8766ccbff67ffff07277a5cd696ecc57fc0598db492bdfed40094d340b6ac0d8efe697d7d82ad03f8b5ba23ae2634f88cd287d9b  xiphos-4.0.3-20150806.tar.gz"
-- 
2.5.0

---
Unsubscribe:  [email-masked]
Help:         [email-masked]
---

---

From: Isaac Dunham <[email-masked]>
Date: Sun, 9 Aug 2015 18:23:59 -0700

> +++ b/testing/xiphos/APKBUILD

This may be premature; don't apply it just yet.
It seems the build options have changed.

Thanks,
Isaac Dunham

---

---

From: Francesco Colista <[email-masked]>
Date: Mon, 10 Aug 2015 15:37:13 +0200

>>  1 file changed, 5 insertions(+), 5 deletions(-)

Hi Isaac, xiphos does not build:

/home/fcolista/aports/testing/xiphos/src/xiphos-4.0.3/build/../src/main/biblesync_glue.cc:243: 
undefined reference to `BibleSync::listenToSpeaker(bool, 
std::__cxx11::basic_string<char, std::char_traits<char>, 
std::allocator<char> >)'
default/src/main/biblesync_glue_1.o: In function `listen_toggled':
/home/fcolista/aports/testing/xiphos/src/xiphos-4.0.3/build/../src/main/biblesync_glue.cc:360: 
undefined reference to `BibleSync::listenToSpeaker(bool, 
std::__cxx11::basic_string<char, std::char_traits<char>, 
std::allocator<char> >)'
default/src/main/sword_1.o: In function `main_init_backend':
/home/fcolista/aports/testing/xiphos/src/xiphos-4.0.3/build/../src/main/sword.cc:819: 
undefined reference to 
`BibleSync::BibleSync(std::__cxx11::basic_string<char, 
std::char_traits<char>, std::allocator<char> >, 
std::__cxx11::basic_string<char, std::char_traits<char>, 
std::allocator<char> >, std::__cxx11::basic_string<char, 
std::char_traits<char>, std::allocator<char> >)'
collect2: error: ld returned 1 exit status
Waf: Leaving directory 
`/home/fcolista/aports/testing/xiphos/src/xiphos-4.0.3/build'
Build failed:  -> task failed (err #1):
         {task: cxx_link 
locale_set_2.o,marshal_2.o,about_modules_2.o,about_sword_2.o,about_trans_2.o,about_xiphos_2.o,bibletext_2.o,bibletext_dialog_2.o,bookmark_dialog_2.o,bookmarks_menu_2.o,bookmarks_treeview_2.o,cipher_key_dialog_2.o,commentary_2.o,commentary_dialog_2.o,dialog_2.o,dictlex_2.o,dictlex_dialog_2.o,display_info_2.o,dummy_2.o,export_bookmarks_2.o,export_dialog_2.o,find_dialog_2.o,font_dialog_2.o,gbs_2.o,gbs_dialog_2.o,gui_2.o,ipc_2.o,main_menu_2.o,main_window_2.o,menu_popup_2.o,mod_mgr_2.o,navbar_book_2.o,navbar_book_dialog_2.o,navbar_versekey_2.o,navbar_versekey_dialog_2.o,navbar_versekey_editor_2.o,navbar_versekey_parallel_2.o,parallel_dialog_2.o,parallel_tab_2.o,parallel_view_2.o,preferences_dialog_2.o,search_dialog_2.o,search_sidebar_2.o,sidebar_2.o,sidebar_dialog_2.o,splash_2.o,tabbed_browser_2.o,treekey-editor_2.o,utilities_2.o,xiphos_2.o,gs_stringmgr_1.o,module_manager_1.o,sword_main_1.o,link_dialog_1.o,editor_1.o,webkit_editor_1.o,biblesync_glue_1.o,configs_1.o,display_1.o,exp
 ort_pass
age_1.o,global_ops_1.o,lists_1.o,main_1.o,mod_mgr_1.o,module_dialogs_1.o,modulecache_1.o,navbar_1.o,navbar_book_1.o,navbar_book_dialog_1.o,navbar_versekey_1.o,parallel_view_1.o,prayerlists_1.o,previewer_1.o,search_dialog_1.o,search_sidebar_1.o,settings_1.o,sidebar_1.o,sword_1.o,sword_treekey_1.o,tab_history_1.o,url_1.o,xml_1.o,marshal_1.o,xiphos_html_1.o,marshal_1.o,wk-html_1.o 
-> xiphos}
>>> ERROR: xiphos: all failed
>>> xiphos: Uninstalling dependencies...

Thanks.

-- 
:: Francesco Colista
:: Alpine Linux Infrstraucture
:: http://www.alpinelinux.org

---

---

From: Isaac Dunham <[email-masked]>
Date: Wed, 12 Aug 2015 17:05:48 -0700

> Hi Isaac, xiphos does not build:

I noticed that. 
However, I'm not sure what the solution is.

Due to the references to __cxx11, I'm *guessing* that biblesync should
have been rebuilt for the gcc5.1 transition, but I don't know for sure.

Is that likely?

>         {task: cxx_link locale_set_2.o,marshal_2.o,about_modules_2.o,about_sword_2.o,about_trans_2.o,about_xiphos_2.o,bibletext_2.o,bibletext_dialog_2.o,bookmark_dialog_2.o,bookmarks_menu_2.o,bookmarks_treeview_2.o,cipher_key_dialog_2.o,commentary_2.o,commentary_dialog_2.o,dialog_2.o,dictlex_2.o,dictlex_dialog_2.o,display_info_2.o,dummy_2.o,export_bookmarks_2.o,export_dialog_2.o,find_dialog_2.o,font_dialog_2.o,gbs_2.o,gbs_dialog_2.o,gui_2.o,ipc_2.o,main_menu_2.o,main_window_2.o,menu_popup_2.o,mod_mgr_2.o,navbar_book_2.o,navbar_book_dialog_2.o,navbar_versekey_2.o,navbar_versekey_dialog_2.o,navbar_versekey_editor_2.o,navbar_versekey_parallel_2.o,parallel_dialog_2.o,parallel_tab_2.o,parallel_view_2.o,preferences_dialog_2.o,search_dialog_2.o,search_sidebar_2.o,sidebar_2.o,sidebar_dialog_2.o,splash_2.o,tabbed_browser_2.o,treekey-editor_2.o,utilities_2.o,xiphos_2.o,gs_stringmgr_1.o,module_manager_1.o,sword_main_1.o,link_dialog_1.o,editor_1.o,webkit_editor_1.o,biblesync_glue_1.o,configs_1.o,display_1.o,export_pass

---

---

From: Natanael Copa <[email-masked]>
Date: Thu, 13 Aug 2015 11:06:52 +0200

On Wed, 12 Aug 2015 17:05:48 -0700

> have been rebuilt for the gcc5.1 transition, but I don't know for sure.

That is very likely. I pushed a rebuild for that.

-nc

---

---

From: Isaac Dunham <[email-masked]>
Date: Thu, 13 Aug 2015 22:38:25 -0700

> That is very likely. I pushed a rebuild for that.

It seems that was enough; the build had failed there for me, but now it
succeeds.
I think this is OK to go in now.

Thanks,
Isaac Dunham

---