sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-18 01:39:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

- Update to 3.1.5

Browse source
This commit is contained in:
Thomas Abthorpe 2012-02-22 18:36:32 +00:00
parent 206d7d84bd
commit ccaa209dfa
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=292079
6 changed files with 118 additions and 69 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
misc/xiphos/Makefile
View file

@ -6,8 +6,7 @@
#
PORTNAME= xiphos
PORTVERSION= 3.1.4
PORTREVISION= 2
PORTVERSION= 3.1.5
CATEGORIES= misc gnome
MASTER_SITES= SF/gnomesword/Xiphos/${PORTVERSION}
@ -26,12 +25,12 @@ USE_PYTHON_BUILD= yes
USE_GETTEXT= yes
INSTALLS_OMF= yes
INSTALLS_ICONS= yes
USE_GNOME= gnomehack gnomeprefix gtkhtml3 \
intlhack libgsf
USE_GNOME= gnomehack gnomeprefix gtkhtml3 intlhack libgsf
do-configure:
@cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ./waf configure \
--prefix=${PREFIX} --enable-gtkhtml --debug-level=optimized
--prefix=${PREFIX} --destdir=${PREFIX} \
--backend gtkhtml --gtk=2
do-build:
@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ./waf build

4
misc/xiphos/distinfo
View file

@ -1,2 +1,2 @@
SHA256 (xiphos-3.1.4.tar.gz) = 4a585459e15458509d6a6e4e71a8c8739f8ab27ca913c846bc2a903763103687
SIZE (xiphos-3.1.4.tar.gz) = 6473885
SHA256 (xiphos-3.1.5.tar.gz) = db7a937b830628baae083143cf898772c097463705eeb4cf7238e2dbb5061179
SIZE (xiphos-3.1.5.tar.gz) = 6720373

12
misc/xiphos/files/patch-src__gnome2__utilities.c
View file

@ -1,12 +0,0 @@
--- ./src/gnome2/utilities.c.orig 2010-10-21 11:08:39.000000000 -0400
+++ ./src/gnome2/utilities.c 2010-10-21 11:10:46.000000000 -0400
@@ -1934,7 +1934,9 @@
#define IMGSRC_STRING "<img src=\""
#define IMGSRC_LENGTH 10 // strlen(IMGSRC_STRING)
+#ifndef HAVE_STRCASESTR
const char *strcasestr(const char *haystack, const char *needle);
+#endif
const char *
AnalyzeForImageSize(const char *origtext,

73
misc/xiphos/files/patch-src__main__display.cc Normal file
View file

@ -0,0 +1,73 @@
--- ./src/main/display.cc.orig 2012-02-20 17:02:30.000000000 -0500
+++ ./src/main/display.cc 2012-02-21 00:40:06.000000000 -0500
@@ -29,12 +29,6 @@
#include <thmlhtmlhref.h>
#include <gbfhtmlhref.h>
#include <teihtmlhref.h>
-#ifndef NO_SWORD_SET_RENDER_NOTE_NUMBERS
-/* these files are erroneously uninstalled as of previous release */
-#include <osisxhtml.h>
-#include <thmlxhtml.h>
-#include <gbfxhtml.h>
-#endif
#include <osisvariants.h>
#include <thmlvariants.h>
@@ -650,7 +644,6 @@
if ((reported = backend->get_entry_attribute("Footnote", "1", "n", false))) {
g_free(reported); // dispose of test junk.
-#ifdef NO_SWORD_SET_RENDER_NOTE_NUMBERS
//
// with recent engine change to auto-render
// note/xref markers, this is unneeded.
@@ -689,7 +682,6 @@
// naïveté: if any verse uses 'n=', all do: reset for next verse.
if (reset)
footnote = 0;
-#endif /* NO_SWORD_SET_RENDER_NOTE_NUMBERS */
}
// otherwise we simply count notes & xrefs through the verse.
@@ -762,41 +754,8 @@
}
}
-#ifdef NO_SWORD_SET_RENDER_NOTE_NUMBERS
// placeholder for older Sword.
#define set_render_numbers(x,y) /* nothing */
-#else
-void
-set_render_numbers(SWModule& imodule, GLOBAL_OPS *ops)
-{
- for (FilterList::const_iterator it =
- imodule.getRenderFilters().begin();
- it != imodule.getRenderFilters().end();
- it++) {
- OSISHTMLHREF *f1 = dynamic_cast<OSISHTMLHREF *>(*it);
- if (f1)
- f1->setRenderNoteNumbers((ops->xrefnotenumbers != 0));
- ThMLHTMLHREF *f2 = dynamic_cast<ThMLHTMLHREF *>(*it);
- if (f2)
- f2->setRenderNoteNumbers((ops->xrefnotenumbers != 0));
- GBFHTMLHREF *f3 = dynamic_cast<GBFHTMLHREF *>(*it);
- if (f3)
- f3->setRenderNoteNumbers((ops->xrefnotenumbers != 0));
- TEIHTMLHREF *f4 = dynamic_cast<TEIHTMLHREF *>(*it);
- if (f4)
- f4->setRenderNoteNumbers((ops->xrefnotenumbers != 0));
- OSISXHTML *f5 = dynamic_cast<OSISXHTML *>(*it);
- if (f5)
- f5->setRenderNoteNumbers((ops->xrefnotenumbers != 0));
- ThMLXHTML *f6 = dynamic_cast<ThMLXHTML *>(*it);
- if (f6)
- f6->setRenderNoteNumbers((ops->xrefnotenumbers != 0));
- GBFXHTML *f7 = dynamic_cast<GBFXHTML *>(*it);
- if (f7)
- f7->setRenderNoteNumbers((ops->xrefnotenumbers != 0));
- }
-}
-#endif /* !NO_SWORD_SET_RENDER_NOTE_NUMBERS */
//
// display of commentary by chapter.

11
misc/xiphos/files/patch-waffles__gnome.py
View file

@ -1,11 +0,0 @@
--- ./waffles/gnome.py.orig 2010-10-15 17:32:41.000000000 -0400
+++ ./waffles/gnome.py 2010-10-21 11:00:42.000000000 -0400
@@ -216,7 +216,7 @@
xsltproc2po = conf.find_program('xsltproc', var='XSLTPROC2PO')
conf.env['XML2POFLAGS'] = '-e -p'
conf.env['SCROLLKEEPER_DATADIR'] = Utils.cmd_output("scrollkeeper-config --pkgdatadir", silent=1).strip()
- conf.env['DB2OMF'] = Utils.cmd_output("/usr/bin/pkg-config --variable db2omf gnome-doc-utils", silent=1).strip()
+ conf.env['DB2OMF'] = Utils.cmd_output("pkg-config --variable db2omf gnome-doc-utils", silent=1).strip()
def set_options(opt):
opt.add_option('--want-rpath', type='int', default=1, dest='want_rpath', help='set rpath to 1 or 0 [Default 1]')

78
misc/xiphos/pkg-plist
View file

@ -1,4 +1,5 @@
bin/xiphos
bin/xiphos-nav
share/applications/xiphos.desktop
%%DOCSDIR%%/AUTHORS
%%DOCSDIR%%/COPYING
@ -120,7 +121,6 @@ share/gnome/help/xiphos/fr/figures/sword_install.png
share/gnome/help/xiphos/fr/figures/sword_remove.png
share/gnome/help/xiphos/fr/figures/sword_sources.png
share/gnome/help/xiphos/fr/xiphos.xml
bin/xiphos-nav
share/icons/hicolor/icon-theme.cache
share/icons/hicolor/scalable/apps/xiphos.svg
share/locale/ar/LC_MESSAGES/xiphos.mo
@ -153,73 +153,73 @@ share/locale/zh_TW/LC_MESSAGES/xiphos.mo
share/omf/xiphos/xiphos-C.omf
share/omf/xiphos/xiphos-fa.omf
share/omf/xiphos/xiphos-fr.omf
share/pixmaps/xiphos/about.png
share/pixmaps/xiphos/book_closed.png
share/pixmaps/xiphos/book_closed_rtol.png
share/pixmaps/xiphos/book_open.png
share/pixmaps/xiphos/book_open_rtol.png
share/pixmaps/xiphos/chat_icon-16.png
share/pixmaps/xiphos/dlg-un-16.png
share/pixmaps/xiphos/dlg-un.png
share/pixmaps/xiphos/epiphany-bookmark-page.png
share/pixmaps/xiphos/epiphany-bookmarks.png
share/pixmaps/xiphos/epiphany-secure.png
share/pixmaps/xiphos/epiphany-unsecure.png
share/pixmaps/xiphos/gnome-session.png
share/pixmaps/xiphos/gnome-window-manager.png
share/pixmaps/xiphos/gnome-windows.png
share/pixmaps/xiphos/gs2-48x48-old.ico
share/pixmaps/xiphos/gs2-48x48-old.png
share/pixmaps/xiphos/gs2-48x48.ico
share/pixmaps/xiphos/gs2-48x48.png
share/pixmaps/xiphos/gs2.xpm
share/pixmaps/xiphos/indexed-16.png
share/pixmaps/xiphos/indexed.png
share/pixmaps/xiphos/init-settings.png
share/pixmaps/xiphos/logo.png
share/pixmaps/xiphos/mailing_list_icon-16.png
share/pixmaps/xiphos/mozilla-icon.png
share/pixmaps/xiphos/new_tab_button.png
share/pixmaps/xiphos/silk-edit-bookmarks.png
share/pixmaps/xiphos/splash.png
share/pixmaps/xiphos/sword-big.png
share/pixmaps/xiphos/sword.png
share/pixmaps/xiphos/sword_icon-16.png
share/pixmaps/xiphos/translation_icon-16.png
share/pixmaps/xiphos/tt.png
share/pixmaps/xiphos/window-close.png
share/pixmaps/xiphos/xiphos-button-125.png
share/pixmaps/xiphos/xiphos-x-16.png
share/pixmaps/xiphos/xiphos.xpm
%%DATADIR%%/about.png
%%DATADIR%%/arrow_down.png
%%DATADIR%%/arrow_down_box.png
%%DATADIR%%/arrow_up.png
%%DATADIR%%/arrow_up_box.png
%%DATADIR%%/book_closed.png
%%DATADIR%%/book_closed_rtol.png
%%DATADIR%%/book_open.png
%%DATADIR%%/book_open_rtol.png
%%DATADIR%%/bookmarks.glade
%%DATADIR%%/bookmarks.gtkbuilder
%%DATADIR%%/chat_icon-16.png
%%DATADIR%%/dlg-un-16.png
%%DATADIR%%/dlg-un.png
%%DATADIR%%/editor_link_dialog.xml
%%DATADIR%%/editor_note.xml
%%DATADIR%%/editor_studypad.xml
%%DATADIR%%/epiphany-bookmark-page.png
%%DATADIR%%/epiphany-bookmarks.png
%%DATADIR%%/epiphany-secure.png
%%DATADIR%%/epiphany-unsecure.png
%%DATADIR%%/export-dialog.glade
%%DATADIR%%/export-dialog.gtkbuilder
%%DATADIR%%/gnome-session.png
%%DATADIR%%/gnome-sound-properties.png
%%DATADIR%%/gnome-window-manager.png
%%DATADIR%%/gnome-windows.png
%%DATADIR%%/gs2-48x48-old.ico
%%DATADIR%%/gs2-48x48-old.png
%%DATADIR%%/gs2-48x48.ico
%%DATADIR%%/gs2-48x48.png
%%DATADIR%%/gs2.xpm
%%DATADIR%%/indexed-16.png
%%DATADIR%%/indexed.png
%%DATADIR%%/init-settings.png
%%DATADIR%%/languages
%%DATADIR%%/logo.png
%%DATADIR%%/mailing_list_icon-16.png
%%DATADIR%%/markverse.glade
%%DATADIR%%/markverse.gtkbuilder
%%DATADIR%%/module-manager.glade
%%DATADIR%%/module-manager.gtkbuilder
%%DATADIR%%/mozilla-icon.png
%%DATADIR%%/navbar_versekey.glade
%%DATADIR%%/navbar_versekey.gtkbuilder
%%DATADIR%%/new_tab_button.png
%%DATADIR%%/prefs.glade
%%DATADIR%%/prefs.gtkbuilder
%%DATADIR%%/search-dialog.glade
%%DATADIR%%/search-dialog.gtkbuilder
%%DATADIR%%/silk-edit-bookmarks.png
%%DATADIR%%/splash.png
%%DATADIR%%/sword-big.png
%%DATADIR%%/sword.png
%%DATADIR%%/sword3.png
%%DATADIR%%/sword_icon-16.png
%%DATADIR%%/translation_icon-16.png
%%DATADIR%%/tt.png
%%DATADIR%%/window-close.png
%%DATADIR%%/xi-export-bookmarks.glade
%%DATADIR%%/xi-menus-popup.gtkbuilder
%%DATADIR%%/xi-menus.glade
%%DATADIR%%/xi-menus.gtkbuilder
%%DATADIR%%/xi-splash.ui
%%DATADIR%%/xiphos-button-125.png
%%DATADIR%%/xiphos-x-16.png
%%DATADIR%%/xiphos.xpm
@dirrm %%DATADIR%%
@dirrm share/pixmaps/xiphos
@dirrm share/omf/xiphos