cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bring all stable patches from upstream.

Browse Source 
Still broken at runtime but at least we have a base to start and fix
things.
This commit is contained in:
ajacoutot 2019-02-04 17:05:42 +00:00
parent 346116cfdd
commit b4dbebfb29
5 changed files with 51 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
editors/abiword/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.120 2018/06/29 22:16:11 espie Exp $
# $OpenBSD: Makefile,v 1.121 2019/02/04 17:05:42 ajacoutot Exp $
# XXX error: 'nullptr' was not declared in this scope
CXXFLAGS += -std=c++11
@ -11,7 +11,23 @@ COMMENT= free cross-platform WYSIWYG word processor
VERSION= 3.0.2
DISTNAME= abiword-${VERSION}
REVISION= 5
REVISION= 6
MASTER_SITES0= https://gitlab.gnome.org/World/AbiWord/commit/
PATCH_DIST_STRIP= -p1
PATCHFILES= abf88e1a8b441a0d678924503f2b53267dd5da52.diff:0 \
e86f5ddf9c51824fca8555cf5daa8e81ed51f6e6.diff:0 \
b0dc63173970e73bb0ef453128cb292dc616977f.diff:0 \
2527fe2d9703183cede26139e23ccd6ceccca845.diff:0 \
7ef52ffab8eea0a5f0e5289e99dff3a8f09298f1.diff:0 \
9ec47e948f504d6f344abad5dd63ad8eb7dea65d.diff:0 \
cec2fda355b67b5b814a803c5ed128c425cbb030.diff:0 \
a3d4383af4da7e9f7550a80621969766cd0e96a3.diff:0 \
eeb81b69c2ad1298a2c20274243bd5a1cdd62dcd.diff:0 \
6b55f5fd8e1eb03248db3113f123653c93e352f1.diff:0 \
09ba862866f7be17baf8110306284f9da64e8bab.diff:0 \
a71100deb93e3b471199003e8acd5067fc4ff091.diff:0
MAJORVER= ${VERSION:C/..$//}
SUBST_VARS= MAJORVER
@ -26,7 +42,7 @@ MAINTAINER= Antoine Jacoutot <ajacoutot@openbsd.org>
PERMIT_PACKAGE_CDROM= Yes
WANTLIB += ICE SM X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi
WANTLIB += Xinerama Xrandr Xrender atk-1.0 atk-bridge-2.0 atspi
WANTLIB += Xinerama Xrandr Xrender atk-1.0 atk-bridge-2.0
WANTLIB += avahi-common bz2 c cairo cairo-gobject croco-0.6 crypto
WANTLIB += curl dbus-1 enchant epoxy expat ffi fontconfig freetype
WANTLIB += fribidi gcrypt gdk-3 gdk_pixbuf-2.0 gio-2.0 glib-2.0
@ -34,9 +50,9 @@ WANTLIB += gmodule-2.0 gmp gobject-2.0 goffice-0.10 gpg-error
WANTLIB += graphite2 gs gsf-1 gthread-2.0 gtk-3 harfbuzz hogweed
WANTLIB += iconv idn2 intl jpeg ltdl lzma m mpfr nettle nghttp2
WANTLIB += p11-kit pango-1.0 pangocairo-1.0 pangoft2-1.0 pcre
WANTLIB += pixman-1 png pthread raptor2 rasqal rdf
WANTLIB += pixman-1 png16 pthread raptor2 rasqal rdf
WANTLIB += rsvg-2 spectre ssl ${LIBCXX} tasn1 unistring uuid wmf-0.2
WANTLIB += wmflite-0.2 wv-1.2 xcb xcb-render xcb-shm xml2 xslt Xtst
WANTLIB += wmflite-0.2 wv-1.2 xcb xcb-render xcb-shm xml2 xslt
WANTLIB += yajl z
MASTER_SITES= http://www.abisource.com/downloads/abiword/${VERSION}/source/
@ -49,8 +65,6 @@ COMPILER = base-clang ports-gcc
CFLAGS += -O0
.endif
MODPY_RUNDEP= No
USE_GMAKE= Yes
BUILD_DEPENDS= devel/gobject-introspection

24
editors/abiword/distinfo
View File

@ -1,2 +1,26 @@
SHA256 (09ba862866f7be17baf8110306284f9da64e8bab.diff) = jBZsy4LlwEsWOTYv52CbM8YRrLM3nDVt3XQdkJTb67c=
SHA256 (2527fe2d9703183cede26139e23ccd6ceccca845.diff) = KJLSWt+eUojH7i8AEwsb8LP5K7LzCaZHU1pSeVw2T/A=
SHA256 (6b55f5fd8e1eb03248db3113f123653c93e352f1.diff) = mSNJcIX3GI3zgnwEeaEIgosBSIGCvp9zQ+l94b0v0Qw=
SHA256 (7ef52ffab8eea0a5f0e5289e99dff3a8f09298f1.diff) = AdXP1CzZp3Zj1xn0rjuD3RyYnYPBCc6vLH6sPLo9wmQ=
SHA256 (9ec47e948f504d6f344abad5dd63ad8eb7dea65d.diff) = r+OxCzu6dUgRiNJB4L1jQqiXV6Co7cuFMfFL50GiMEk=
SHA256 (a3d4383af4da7e9f7550a80621969766cd0e96a3.diff) = zU6N7cduSn8ceO3Wn0RMrEDuCnwEiWtApZwlVX8FBBc=
SHA256 (a71100deb93e3b471199003e8acd5067fc4ff091.diff) = mhRSA2eZTD4jE4sN+RpBNZen17Yi44CDIHXfIk2EuCU=
SHA256 (abf88e1a8b441a0d678924503f2b53267dd5da52.diff) = Xu7WIRRxtJVVuyThzCX7sAc6ZnZ93N69YknP3vd0M9g=
SHA256 (abiword-3.0.2.tar.gz) = r7/UWP0CmJ2LDGNiuopMFGhtiWZvVM/bVQG9IJDPNSI=
SHA256 (b0dc63173970e73bb0ef453128cb292dc616977f.diff) = J8NcURIlMLmlRpSpQwDHt1+akewcslYvD8ZiPdpJo5o=
SHA256 (cec2fda355b67b5b814a803c5ed128c425cbb030.diff) = oLT1xaG9ggpwsdkWD/fsXsP1abMjHuezQ9jxTTszdho=
SHA256 (e86f5ddf9c51824fca8555cf5daa8e81ed51f6e6.diff) = sNnnFpcSmUws/PuYxG3cvaT4jHk4HfEdOh7cxAjzP7U=
SHA256 (eeb81b69c2ad1298a2c20274243bd5a1cdd62dcd.diff) = CtVQ6QZB/fA9WQ3eIraBioHRBekOfswKYDqIOsqZT18=
SIZE (09ba862866f7be17baf8110306284f9da64e8bab.diff) = 2099
SIZE (2527fe2d9703183cede26139e23ccd6ceccca845.diff) = 1039
SIZE (6b55f5fd8e1eb03248db3113f123653c93e352f1.diff) = 1690
SIZE (7ef52ffab8eea0a5f0e5289e99dff3a8f09298f1.diff) = 539
SIZE (9ec47e948f504d6f344abad5dd63ad8eb7dea65d.diff) = 687
SIZE (a3d4383af4da7e9f7550a80621969766cd0e96a3.diff) = 17154
SIZE (a71100deb93e3b471199003e8acd5067fc4ff091.diff) = 734
SIZE (abf88e1a8b441a0d678924503f2b53267dd5da52.diff) = 1552
SIZE (abiword-3.0.2.tar.gz) = 11154333
SIZE (b0dc63173970e73bb0ef453128cb292dc616977f.diff) = 1041
SIZE (cec2fda355b67b5b814a803c5ed128c425cbb030.diff) = 1928
SIZE (e86f5ddf9c51824fca8555cf5daa8e81ed51f6e6.diff) = 1144
SIZE (eeb81b69c2ad1298a2c20274243bd5a1cdd62dcd.diff) = 2022

31
editors/abiword/patches/patch-src_af_xap_gtk_xap_UnixFrameImpl_cpp
View File

@ -1,31 +0,0 @@
$OpenBSD: patch-src_af_xap_gtk_xap_UnixFrameImpl_cpp,v 1.1 2017/04/13 09:54:38 ajacoutot Exp $
commit 2ee38d1881aeea27bb49acc450631d813d1f28ba
Author: Hubert Figuière <hub@figuiere.net>
Date: Wed Dec 7 09:44:01 2016 -0500
Bug 13815 - draw event should return TRUE
This fix the black drawing regression witj Gtk3.22
--- src/af/xap/gtk/xap_UnixFrameImpl.cpp.orig Sun Dec 14 15:56:47 2014
+++ src/af/xap/gtk/xap_UnixFrameImpl.cpp Thu Apr 13 11:26:22 2017
@@ -1208,9 +1208,9 @@ gint XAP_UnixFrameImpl::_fe::delete_event(GtkWidget *
}
#if GTK_CHECK_VERSION(3,0,0)
-gint XAP_UnixFrameImpl::_fe::draw(GtkWidget * w, cairo_t * cr)
+gboolean XAP_UnixFrameImpl::_fe::draw(GtkWidget * w, cairo_t * cr)
#else
-gint XAP_UnixFrameImpl::_fe::expose(GtkWidget * w, GdkEventExpose* pExposeEvent)
+gboolean XAP_UnixFrameImpl::_fe::expose(GtkWidget * w, GdkEventExpose* pExposeEvent)
#endif
{
XAP_UnixFrameImpl * pUnixFrameImpl = static_cast<XAP_UnixFrameImpl *>(g_object_get_data(G_OBJECT(w), "user_data"));
@@ -1243,7 +1243,7 @@ gint XAP_UnixFrameImpl::_fe::expose(GtkWidget * w, Gdk
pView->draw(&rClip);
#endif
}
- return FALSE;
+ return TRUE;
}
static bool bScrollWait = false;

22
editors/abiword/patches/patch-src_af_xap_gtk_xap_UnixFrameImpl_h
View File

@ -1,22 +0,0 @@
$OpenBSD: patch-src_af_xap_gtk_xap_UnixFrameImpl_h,v 1.1 2017/04/13 09:54:38 ajacoutot Exp $
commit 2ee38d1881aeea27bb49acc450631d813d1f28ba
Author: Hubert Figuière <hub@figuiere.net>
Date: Wed Dec 7 09:44:01 2016 -0500
Bug 13815 - draw event should return TRUE
This fix the black drawing regression witj Gtk3.22
--- src/af/xap/gtk/xap_UnixFrameImpl.h.orig Sun Apr 7 15:53:03 2013
+++ src/af/xap/gtk/xap_UnixFrameImpl.h Thu Apr 13 11:26:22 2017
@@ -152,9 +152,9 @@ class XAP_UnixFrameImpl : public XAP_FrameImpl (protec
static gint key_release_event(GtkWidget* w, GdkEventKey* e);
static gint delete_event(GtkWidget * w, GdkEvent * /*event*/, gpointer /*data*/);
#if GTK_CHECK_VERSION(3,0,0)
- static gint draw(GtkWidget * w, cairo_t * cr);
+ static gboolean draw(GtkWidget * w, cairo_t * cr);
#else
- static gint expose(GtkWidget * w, GdkEventExpose* pExposeEvent);
+ static gboolean expose(GtkWidget * w, GdkEventExpose* pExposeEvent);
#endif
static gint do_ZoomUpdate( gpointer /* xap_UnixFrame * */ p);
static void vScrollChanged(GtkAdjustment * w, gpointer /*data*/);

7
editors/abiword/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.32 2018/06/29 22:16:11 espie Exp $
@comment $OpenBSD: PLIST,v 1.33 2019/02/04 17:05:42 ajacoutot Exp $
@pkgpath editors/abiword,gnome
@bin bin/abiword
include/abiword-${MAJORVER}/
@ -15,6 +15,11 @@ lib/abiword-${MAJORVER}/plugins/pdf.so
lib/girepository-1.0/Abi-${MAJORVER}.typelib
lib/libabiword-${MAJORVER}.so
lib/pkgconfig/abiword-${MAJORVER}.pc
lib/python${MODPY_VERSION}/site-packages/gi/
lib/python${MODPY_VERSION}/site-packages/gi/overrides/
lib/python${MODPY_VERSION}/site-packages/gi/overrides/Abi.py
lib/python${MODPY_VERSION}/site-packages/gi/overrides/Abi.pyc
lib/python${MODPY_VERSION}/site-packages/gi/overrides/Abi.${MODPY_PYOEXTENSION}
@man man/man1/abiword.1
share/abiword-${MAJORVER}/
share/abiword-${MAJORVER}/clipart/