summaryrefslogtreecommitdiffstats
path: root/editors/abiword-devel/files
diff options
context:
space:
mode:
authormarcus <marcus@FreeBSD.org>2003-04-04 07:12:25 +0000
committermarcus <marcus@FreeBSD.org>2003-04-04 07:12:25 +0000
commitb246bc7eefec850419425d5af9f5c9228cd54b74 (patch)
tree806a5d92959a38f1f4cf0504ceb5e4205a2bea0e /editors/abiword-devel/files
parent4d439e5f68cf9a44b1a5fee32d9d027c96f8a690 (diff)
downloadFreeBSD-ports-b246bc7eefec850419425d5af9f5c9228cd54b74.zip
FreeBSD-ports-b246bc7eefec850419425d5af9f5c9228cd54b74.tar.gz
* Update to 1.1.4
* Enable optional GNOME 2 support
Diffstat (limited to 'editors/abiword-devel/files')
-rw-r--r--editors/abiword-devel/files/patch-src_af_ev_unix_ev_UnixToolbar.cpp16
-rw-r--r--editors/abiword-devel/files/patch-src_af_xap_unix_xap_UnixEncodingManager.cpp17
-rw-r--r--editors/abiword-devel/files/patch-src_wp_ap_unix_ap_UnixApp.cpp11
3 files changed, 33 insertions, 11 deletions
diff --git a/editors/abiword-devel/files/patch-src_af_ev_unix_ev_UnixToolbar.cpp b/editors/abiword-devel/files/patch-src_af_ev_unix_ev_UnixToolbar.cpp
new file mode 100644
index 0000000..2983c82
--- /dev/null
+++ b/editors/abiword-devel/files/patch-src_af_ev_unix_ev_UnixToolbar.cpp
@@ -0,0 +1,16 @@
+--- src/af/ev/unix/ev_UnixToolbar.cpp.orig Mon Mar 24 01:55:52 2003
++++ src/af/ev/unix/ev_UnixToolbar.cpp Mon Mar 24 01:51:14 2003
+@@ -881,11 +881,11 @@
+ GtkWidget * combo;
+ GdkPixbuf * pixbuf;
+ if (pAction->getItemType() == EV_TBIT_ColorFore) {
+- pixbuf = gdk_pixbuf_new_from_xpm_data (static_cast<const char **>(tb_text_fgcolor_xpm));
++ pixbuf = gdk_pixbuf_new_from_xpm_data (static_cast<char **>(tb_text_fgcolor_xpm));
+ combo = color_combo_new (pixbuf, szToolTip, &e_black, color_group_fetch("foreground_color", NULL));
+ }
+ else {
+- pixbuf = gdk_pixbuf_new_from_xpm_data (static_cast<const char **>(tb_text_bgcolor_xpm));
++ pixbuf = gdk_pixbuf_new_from_xpm_data (static_cast<char **>(tb_text_bgcolor_xpm));
+ combo = color_combo_new (pixbuf, szToolTip, NULL, color_group_fetch("background_color", NULL));
+ }
+ gtk_combo_box_set_title (GTK_COMBO_BOX (combo),
diff --git a/editors/abiword-devel/files/patch-src_af_xap_unix_xap_UnixEncodingManager.cpp b/editors/abiword-devel/files/patch-src_af_xap_unix_xap_UnixEncodingManager.cpp
new file mode 100644
index 0000000..0013c3e
--- /dev/null
+++ b/editors/abiword-devel/files/patch-src_af_xap_unix_xap_UnixEncodingManager.cpp
@@ -0,0 +1,17 @@
+--- src/af/xap/unix/xap_UnixEncodingManager.cpp.orig Fri Mar 7 02:33:39 2003
++++ src/af/xap/unix/xap_UnixEncodingManager.cpp Tue Mar 25 19:49:09 2003
+@@ -475,6 +475,7 @@
+ NativeUnicodeEncodingName = "UTF-8";
+ LanguageISOName = "en";
+ LanguageISOTerritory = "US";
++ XAP_EncodingManager::initialize();
+
+ if (!*locname || !strcmp(locname,"C"))
+ { /* paranoic case - broken system */
+@@ -582,6 +583,5 @@
+ FREEP(mod);
+ }
+ }
+- XAP_EncodingManager::initialize();
+ describe();
+ };
diff --git a/editors/abiword-devel/files/patch-src_wp_ap_unix_ap_UnixApp.cpp b/editors/abiword-devel/files/patch-src_wp_ap_unix_ap_UnixApp.cpp
deleted file mode 100644
index 69aae90..0000000
--- a/editors/abiword-devel/files/patch-src_wp_ap_unix_ap_UnixApp.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/wp/ap/unix/ap_UnixApp.cpp.orig Sat Feb 22 01:21:20 2003
-+++ src/wp/ap/unix/ap_UnixApp.cpp Sat Feb 22 01:21:31 2003
-@@ -1241,7 +1241,7 @@
- pMyUnixApp->shutdown();
- delete pMyUnixApp;
-
-- poptFreeContext (Args.poptcon);
-+ //poptFreeContext (Args.poptcon);
- return 0;
- }
-
OpenPOWER on IntegriCloud