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

Unbreak with new evolution and evolution-data-server.

Browse Source
This commit is contained in:
ajacoutot 2014-03-28 06:56:25 +00:00
parent edb913675f
commit 8ccb247ab2
5 changed files with 39 additions and 115 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
mail/evolution-rss/Makefile
View File

@ -1,6 +1,4 @@
# $OpenBSD: Makefile,v 1.40 2014/03/27 14:20:58 ajacoutot Exp $
BROKEN= XXX temporary
# $OpenBSD: Makefile,v 1.41 2014/03/28 06:56:25 ajacoutot Exp $
EVO_VERSION= 3.12
SUBST_VARS += EVO_VERSION
@ -11,7 +9,19 @@ COMMENT= RSS reader plugin for evolution
GNOME_PROJECT= evolution-rss
GNOME_VERSION= 0.3.94
REVISION= 3
REVISION= 4
MASTER_SITES0= https://distfiles.bsdfrog.org/evolution-rss/
PATCH_DIST_STRIP= -p1
PATCHFILES=\
87ae939abd5ef896130bab49d84660309a1826d1.patch:0 \
a9805199c18b1a8b6b2c48d83b3c78be21b2ab91.patch:0 \
2e00c47b1491d547914d31b0fc7bec1f170c814c.patch:0 \
55f2fc268fd4d0ee286bf8340e81c2dd265abd5b.patch:0 \
6a1bc452b329acfe75b487b214f664848282fe25.patch:0 \
7600f67649f3f25cc4bae9e132517c9ab63b54b5.patch:0 \
25fd335f1b5e6d7b6a25e229a840621bf13a1b76.patch:0 \
b420d3f5b4e9b9b7c288d403290de6bfb9016f0e.patch:0
CATEGORIES= mail
@ -28,22 +38,22 @@ WANTLIB += Xi Xinerama Xrandr Xrender Xt asn1 atk-1.0 atk-bridge-2.0
WANTLIB += atspi c cairo cairo-gobject camel-1.2 com_err crypto
WANTLIB += db dbus-1 dbus-glib-1 ebackend-1.2 ebook-1.2 ebook-contacts-1.2
WANTLIB += ecal-1.2 edata-book-1.2 edataserver-1.2 enchant expat
WANTLIB += ffi fontconfig freetype gailutil-3 gck-1 gcr-base-3
WANTLIB += ffi fontconfig freetype gailutil-3 gck-1 gcr-3 gcr-base-3
WANTLIB += gcrypt gdk-3 gdk_pixbuf-2.0 geoclue gio-2.0 glib-2.0
WANTLIB += gmodule-2.0 gnome-desktop-3 gobject-2.0 gpg-error graphite2
WANTLIB += gssapi gstapp-1.0 gstaudio-1.0 gstbase-1.0 gstfft-1.0
WANTLIB += gstpbutils-1.0 gstreamer-1.0 gsttag-1.0 gstvideo-1.0
WANTLIB += gthread-2.0 gtk-3 gtkhtml-4.0 gtkhtml-editor-4.0 harfbuzz
WANTLIB += harfbuzz-icu heimbase ical icalss icalvcal icudata
WANTLIB += icui18n icuuc javascriptcoregtk-3.0 jpeg krb5 m nspr4
WANTLIB += nss3 nssutil3 orc-0.4 p11-kit pango-1.0 pangocairo-1.0
WANTLIB += gthread-2.0 gtk-3 gtkhtml-4.0 gtkhtml-editor-4.0 gtkspell3-3
WANTLIB += harfbuzz harfbuzz-icu heimbase ical icalss icalvcal
WANTLIB += icudata icui18n icuuc javascriptcoregtk-3.0 jpeg krb5
WANTLIB += m nspr4 nss3 nssutil3 orc-0.4 p11-kit pango-1.0 pangocairo-1.0
WANTLIB += pangoft2-1.0 pcre pixman-1 plc4 plds4 png pthread pthread-stubs
WANTLIB += roken secret-1 smime3 softokn3 soup-2.4 soup-gnome-2.4
WANTLIB += sqlite3 ssl3 stdc++ webkitgtk-3.0 webp wind xcb xcb-render
WANTLIB += xcb-shm xkbfile xml2 xslt z
WANTLIB += xcb-shm xml2 xslt z
#MASTER_SITES= http://gnome.eu.org/
MASTER_SITES= https://distfiles.bsdfrog.org/
MASTER_SITES= http://pkgs.fedoraproject.org/repo/pkgs/evolution-rss/evolution-rss-${GNOME_VERSION}${EXTRACT_SUFX}/77f38f8c98f64f181f74443f331c7336/
MODULES= devel/gettext \
devel/dconf \
@ -58,9 +68,8 @@ RUN_DEPENDS += mail/evolution
MODGNOME_DESKTOP_FILE= Yes
CONFIGURE_STYLE= gnu
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
AUTOCONF_VERSION= 2.69
CONFIGURE_STYLE= autoconf
post-install:
rm ${PREFIX}/lib/evolution/${EVO_VERSION}/{plugins,modules}/*.{a,la}

16
mail/evolution-rss/distinfo
View File

@ -1,2 +1,18 @@
SHA256 (25fd335f1b5e6d7b6a25e229a840621bf13a1b76.patch) = hDLhoyh+NvamzxwXqX4huJJJ2HfBC7c+OAmBXOxtgzs=
SHA256 (2e00c47b1491d547914d31b0fc7bec1f170c814c.patch) = YwnKin7wB118TAKs7ezSZDr/JShEe7zX2ayG5iVSPlY=
SHA256 (55f2fc268fd4d0ee286bf8340e81c2dd265abd5b.patch) = lkyMZLiOk7O7ObjBgkcsOvErU+BGJeKMIZMGm5ER1go=
SHA256 (6a1bc452b329acfe75b487b214f664848282fe25.patch) = inSN57OT8I/S9AWen+ldvIXZEc9IPsH1ZGvK/5ATIAY=
SHA256 (7600f67649f3f25cc4bae9e132517c9ab63b54b5.patch) = 1gBMowMnb7ZUDhZzqewbUQ3+aLYb6xgb17z4Tok9hvA=
SHA256 (87ae939abd5ef896130bab49d84660309a1826d1.patch) = V2SZCkef/wD3ck1gi34OEoF3guw8HqaqmkdRMm11p68=
SHA256 (a9805199c18b1a8b6b2c48d83b3c78be21b2ab91.patch) = pMDnowt94dkbZ7TCwNUvj0Kv2KQ4JmvwplhsAbglWAg=
SHA256 (b420d3f5b4e9b9b7c288d403290de6bfb9016f0e.patch) = 2vlHlD49yqjuq6rOsSOtnMlJYTj3E1qNLOdaRdBLxgo=
SHA256 (evolution-rss-0.3.94.tar.xz) = MsiXuBUBoYHBJXjY/jQZd0+rms9qEXqfQdch8MSRobY=
SIZE (25fd335f1b5e6d7b6a25e229a840621bf13a1b76.patch) = 990
SIZE (2e00c47b1491d547914d31b0fc7bec1f170c814c.patch) = 1178
SIZE (55f2fc268fd4d0ee286bf8340e81c2dd265abd5b.patch) = 3688
SIZE (6a1bc452b329acfe75b487b214f664848282fe25.patch) = 2054
SIZE (7600f67649f3f25cc4bae9e132517c9ab63b54b5.patch) = 4579
SIZE (87ae939abd5ef896130bab49d84660309a1826d1.patch) = 2467
SIZE (a9805199c18b1a8b6b2c48d83b3c78be21b2ab91.patch) = 10036
SIZE (b420d3f5b4e9b9b7c288d403290de6bfb9016f0e.patch) = 1520
SIZE (evolution-rss-0.3.94.tar.xz) = 515188

21
mail/evolution-rss/patches/patch-src_rss-config-factory_c
View File

@ -1,21 +0,0 @@
$OpenBSD: patch-src_rss-config-factory_c,v 1.9 2013/12/15 08:42:41 ajacoutot Exp $
From 87ae939abd5ef896130bab49d84660309a1826d1 Mon Sep 17 00:00:00 2001
From: Lucian Langa <lucilanga@gnome.org>
Date: Wed, 09 Oct 2013 20:32:38 +0000
Subject: adapt to Camel changes
--- src/rss-config-factory.c.orig Thu Mar 21 16:59:52 2013
+++ src/rss-config-factory.c Sun Dec 15 09:32:24 2013
@@ -1273,7 +1273,11 @@ rss_delete_folders (CamelStore *store,
d("call rss_delete_rec()\n");
rss_delete_rec (store, fi, error);
+#if (DATASERVER_VERSION >= 3011001)
+ camel_folder_info_free (fi);
+#else
camel_store_free_folder_info (store, fi);
+#endif
}
void

21
mail/evolution-rss/patches/patch-src_rss-image_c
View File

@ -1,21 +0,0 @@
$OpenBSD: patch-src_rss-image_c,v 1.1 2013/12/15 08:42:41 ajacoutot Exp $
From 87ae939abd5ef896130bab49d84660309a1826d1 Mon Sep 17 00:00:00 2001
From: Lucian Langa <lucilanga@gnome.org>
Date: Wed, 09 Oct 2013 20:32:38 +0000
Subject: adapt to Camel changes
--- src/rss-image.c.orig Thu Mar 21 16:59:52 2013
+++ src/rss-image.c Sun Dec 15 09:32:24 2013
@@ -509,7 +509,11 @@ display_folder_icon(GtkTreeStore *tree_store, gchar *k
COL_STRING_ICON_NAME, key,
-1);
g_free(full_name);
+#if (DATASERVER_VERSION >= 3011001)
+ camel_folder_info_free (rssi);
+#else
camel_store_free_folder_info (store, rssi);
+#endif
g_object_unref(pixbuf);
result = TRUE;
}

59
mail/evolution-rss/patches/patch-src_rss_c
View File

@ -1,59 +0,0 @@
$OpenBSD: patch-src_rss_c,v 1.6 2013/12/15 08:42:41 ajacoutot Exp $
From 87ae939abd5ef896130bab49d84660309a1826d1 Mon Sep 17 00:00:00 2001
From: Lucian Langa <lucilanga@gnome.org>
Date: Wed, 09 Oct 2013 20:32:38 +0000
Subject: adapt to Camel changes
--- src/rss.c.orig Thu Aug 29 10:10:04 2013
+++ src/rss.c Sun Dec 15 09:32:24 2013
@@ -4134,7 +4134,11 @@ create_mail(create_feed *CF)
camel_object_unref(new);
camel_object_unref(mail_folder);
#endif
+#if (DATASERVER_VERSION >= 3011001)
+ camel_message_info_unref(info);
+#else
camel_message_info_free(info);
+#endif
g_free(buf);
}
@@ -4593,7 +4597,12 @@ delete_oldest_article(CamelFolder *folder, guint unrea
}
// d("uid:%d j:%d/%d, absdate:%d, date:%s, imax:%d\n",
// i, j, q, min_date, ctime(&min_date), imax);
-out: camel_message_info_free(info);
+out:
+#if (DATASERVER_VERSION >= 3011001)
+ camel_message_info_unref(info);
+#else
+ camel_message_info_free(info);
+#endif
}
camel_folder_freeze(folder);
if (min_date) {
@@ -4689,7 +4698,11 @@ get_feed_age(RDF *r, gpointer name)
feedid);
g_free(feed_name);
}
+#if (DATASERVER_VERSION >= 3011001)
+ camel_message_info_unref(info);
+#else
camel_folder_free_message_info(folder, info);
+#endif
}
#if (DATASERVER_VERSION >= 2031001)
g_object_unref (message);
@@ -4728,7 +4741,11 @@ get_feed_age(RDF *r, gpointer name)
}
}
}
+#if (DATASERVER_VERSION >= 3011001)
+ camel_message_info_unref(info);
+#else
camel_folder_free_message_info(folder, info);
+#endif
}
camel_folder_free_uids (folder, uids);
#if (DATASERVER_VERSION >= 2033001)