diff options
| author | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2004-02-12 03:40:16 +0800 |
|---|---|---|
| committer | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2004-02-12 03:40:16 +0800 |
| commit | 85b95b1edf3494d554fc281a11fa12be813523c8 (patch) | |
| tree | 6293a74a4e45e414a06a529d1388d17e56dc60ea | |
| parent | 705588d17263d03533e4fe9ed70fb7ca36db05cc (diff) | |
| download | marcuscom-ports-85b95b1edf3494d554fc281a11fa12be813523c8.tar marcuscom-ports-85b95b1edf3494d554fc281a11fa12be813523c8.tar.gz marcuscom-ports-85b95b1edf3494d554fc281a11fa12be813523c8.tar.bz2 marcuscom-ports-85b95b1edf3494d554fc281a11fa12be813523c8.tar.lz marcuscom-ports-85b95b1edf3494d554fc281a11fa12be813523c8.tar.xz marcuscom-ports-85b95b1edf3494d554fc281a11fa12be813523c8.tar.zst marcuscom-ports-85b95b1edf3494d554fc281a11fa12be813523c8.zip | |
Fix AbiWord build with gucharmap-1.3.0, and fix the plist.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@1810 df743ca5-7f9a-e211-a948-0013205c9059
| -rw-r--r-- | editors/AbiWord2/Makefile | 2 | ||||
| -rw-r--r-- | editors/AbiWord2/files/patch-src_af_xap_unix_xap_UnixDlg_Insert_Symbol.cpp | 20 | ||||
| -rw-r--r-- | editors/AbiWord2/pkg-plist | 7 |
3 files changed, 24 insertions, 5 deletions
diff --git a/editors/AbiWord2/Makefile b/editors/AbiWord2/Makefile index 9eb537a8e..114a5c98e 100644 --- a/editors/AbiWord2/Makefile +++ b/editors/AbiWord2/Makefile @@ -7,7 +7,7 @@ PORTNAME= AbiWord2 PORTVERSION= 2.1.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= editors MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \ http://www.abisource.com/downloads/Version-${PORTVERSION}/lf/ diff --git a/editors/AbiWord2/files/patch-src_af_xap_unix_xap_UnixDlg_Insert_Symbol.cpp b/editors/AbiWord2/files/patch-src_af_xap_unix_xap_UnixDlg_Insert_Symbol.cpp new file mode 100644 index 000000000..43e2d9ad1 --- /dev/null +++ b/editors/AbiWord2/files/patch-src_af_xap_unix_xap_UnixDlg_Insert_Symbol.cpp @@ -0,0 +1,20 @@ +--- src/af/xap/unix/xap_UnixDlg_Insert_Symbol.cpp.orig Wed Feb 11 13:49:15 2004 ++++ src/af/xap/unix/xap_UnixDlg_Insert_Symbol.cpp Wed Feb 11 13:50:09 2004 +@@ -487,6 +487,7 @@ + GtkWidget * XAP_UnixDialog_Insert_Symbol::_constructWindow(void) + { + GtkWidget * vboxInsertS; ++ GtkWidget * chapters; + + ConstructWindowName(); + +@@ -517,7 +518,8 @@ + m_areaCurrentSym, TRUE, FALSE, 0); + #else + +- m_SymbolMap = gucharmap_charmap_new (); ++ chapters = gucharmap_block_chapters_new (); ++ m_SymbolMap = gucharmap_charmap_new (GUCHARMAP_CHAPTERS (chapters)); + gtk_widget_show (m_SymbolMap); + gtk_box_pack_start(GTK_BOX(vboxInsertS), m_SymbolMap, TRUE, TRUE, 0); + diff --git a/editors/AbiWord2/pkg-plist b/editors/AbiWord2/pkg-plist index d64a72223..bfb1be297 100644 --- a/editors/AbiWord2/pkg-plist +++ b/editors/AbiWord2/pkg-plist @@ -2,7 +2,8 @@ bin/AbiWord-%%ABIVERSION%% bin/abiword bin/ttfadmin.sh bin/ttftool -%%GNOME:%%libdata/bonobo/servers/GNOME_AbiWord_Control_%%ABIVERSION%%.server +libdata/bonobo/servers/GNOME_AbiWord_Control_2_0.server +libdata/bonobo/servers/GNOME_AbiWord_Control_2_2.server share/AbiSuite-%%ABIVERSION%%/AbiWord.exe.MANIFEST share/AbiSuite-%%ABIVERSION%%/AbiWord/glade/ap_UnixDialog_Break.glade share/AbiSuite-%%ABIVERSION%%/AbiWord/glade/ap_UnixDialog_Field.glade @@ -180,8 +181,6 @@ share/AbiSuite-%%ABIVERSION%%/clipart/tree.png share/AbiSuite-%%ABIVERSION%%/clipart/tux_bordelais.png share/AbiSuite-%%ABIVERSION%%/clipart/weather.png share/AbiSuite-%%ABIVERSION%%/clipart/write.png -share/AbiSuite-%%ABIVERSION%%/dictionary/american.hash -share/AbiSuite-%%ABIVERSION%%/dictionary/ispell_dictionary_list.xml share/AbiSuite-%%ABIVERSION%%/icons/abiword_16.xpm share/AbiSuite-%%ABIVERSION%%/icons/abiword_48.png share/AbiSuite-%%ABIVERSION%%/icons/abiword_48.tif @@ -256,7 +255,7 @@ share/AbiSuite-%%ABIVERSION%%/templates/normal.awt-zh_TW share/applications/abiword.desktop share/icons/abiword_48.png share/gnome/apps/Applications/abiword.desktop -%%GNOME:%%share/gnome/gnome-%%ABIVERSION%%/ui/abi-nautilus-view-file.xml +%%GNOME:%%share/gnome/gnome-2.0/ui/abi-nautilus-view-file.xml share/gnome/pixmaps/abiword_48.png @dirrm share/AbiSuite-%%ABIVERSION%%/templates @dirrm share/AbiSuite-%%ABIVERSION%%/icons |