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

Start the GNOME3 merge armageddon... breakage expected.

Browse Source
This commit is contained in:
ajacoutot 2011-09-12 07:26:18 +00:00
parent 3ec94788dd
commit 32563635a5
186 changed files with 6955 additions and 8806 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

132
audio/rhythmbox/Makefile
View File

@ -1,14 +1,11 @@
# $OpenBSD: Makefile,v 1.75 2011/08/30 06:52:57 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.76 2011/09/12 07:26:18 ajacoutot Exp $
# coherence plugin is installed but not activated by default so we don't
# enforce dependency on multimedia/coherence to lower requirements
COMMENT= music management application for GNOME
COMMENT= integrated music management application for GNOME
GNOME_PROJECT= rhythmbox
GNOME_VERSION= 0.12.8
GNOME_VERSION= 2.90.1.1
REVISION = 15
EXTRACT_SUFX= .tar.xz
SHARED_LIBS += rhythmbox-core 0.0 # .0.0
@ -25,78 +22,111 @@ PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
WANTLIB += GL ICE ORBit-2 SM X11 Xau Xcomposite Xcursor Xdamage
WANTLIB += Xdmcp Xext Xfixes Xi Xinerama Xrandr Xrender Xxf86vm
WANTLIB += atk-1.0 avahi-client avahi-common avahi-glib c cairo
WANTLIB += dbus-1 dbus-glib-1 drm expat ffi fontconfig freetype
WANTLIB += gcrypt gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 glib-2.0
WANTLIB += gmime-2.6 gmodule-2.0 gnome-keyring gnome-media-profiles
WANTLIB += gobject-2.0 gpg-error gpod gstbase-0.10 gstcontroller-0.10
WANTLIB += gstinterfaces-0.10 gstpbutils-0.10 gstreamer-0.10 gstvideo-0.10
WANTLIB += gthread-2.0 gtk-x11-2.0 m notify pango-1.0 pangocairo-1.0
WANTLIB += pangoft2-1.0 pcre pixman-1 png pthread pthread-stubs
WANTLIB += soup-2.4 soup-gnome-2.4 sqlite3 totem-plparser
WANTLIB += util xcb xcb-render xcb-shm xml2 z assuan gpgme-pthread
WANTLIB += ${MODPY_WANTLIB} archive bz2 lzma
WANTLIB += GL ICE SM X11 Xau Xcomposite Xcursor Xdamage Xdmcp
WANTLIB += Xext Xfixes Xi Xinerama Xrandr Xrender Xxf86vm archive
WANTLIB += assuan atk-1.0 bz2 c cairo cairo-gobject dbus-1 dbus-glib-1
WANTLIB += drm expat ffi fontconfig freetype gcrypt gdk-3 gdk_pixbuf-2.0
WANTLIB += gio-2.0 girepository-1.0 glib-2.0 gmime-2.6 gmodule-2.0
WANTLIB += gnome-keyring gobject-2.0 gpg-error gpgme-pthread gpod
WANTLIB += gstbase-0.10 gstcontroller-0.10 gstinterfaces-0.10
WANTLIB += gstpbutils-0.10 gstreamer-0.10 gsttag-0.10 gstvideo-0.10
WANTLIB += gthread-2.0 gtk-3 json-glib-1.0 lzma m notify pango-1.0
WANTLIB += pangocairo-1.0 pangoft2-1.0 pcre peas-1.0 peas-gtk-1.0
WANTLIB += pixman-1 png pthread pthread-stubs soup-2.4 soup-gnome-2.4
WANTLIB += sqlite3 totem-plparser xcb xcb-render xcb-shm xml2
WANTLIB += z
MODULES= devel/gettext \
x11/gnome \
lang/python \
devel/gconf2
devel/dconf
BUILD_DEPENDS= multimedia/gstreamer-0.10/py-gstreamer
LIB_DEPENDS= ${MODPY_LIB_DEPENDS} \
devel/libnotify>=0.7.2 \
x11/gnome/media \
x11/gnome/totem-pl-parser \
multimedia/gstreamer-0.10/plugins-base \
devel/libsoup,-gnome \
net/avahi \
BUILD_DEPENDS= devel/gobject-introspection \
audio/libmusicbrainz
LIB_DEPENDS= devel/libpeas \
audio/libgpod \
x11/gtk+2
RUN_DEPENDS+= x11/gnome/icon-theme \
multimedia/gstreamer-0.10/py-gstreamer
devel/json-glib \
devel/libnotify>=0.7.2 \
x11/gnome/totem-pl-parser
# needed for the magnatune plugin
RUN_DEPENDS+= x11/gnome/py-gnome-desktop
# needed for sndio
RUN_DEPENDS= multimedia/gstreamer-0.10/py-gstreamer \
x11/dbus-python \
www/py-mako \
audio/libmusicbrainz
# needed for sndio(7) support
RUN_DEPENDS+= multimedia/gstreamer-0.10/plugins-good
REGRESS_DEPENDS= devel/check
DESKTOP_FILES= Yes
MODGNOME_HELP_FILES= Yes
MODGCONF2_SCHEMAS_DIR= rhythmbox
CONFIGURE_STYLE= gnu
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
CONFIGURE_ARGS= ${CONFIGURE_SHARED} \
--with-database=tree \
--with-gnome-keyring \
--with-ipod \
--with-mdns=avahi \
--with-x \
--enable-python \
--enable-daap \
--without-brasero \
--without-hal \
--without-libbrasero-media \
--without-libnautilus-burn \
--without-gudev \
--without-webkit \
--disable-daap \
--disable-fm-radio \
--disable-lirc
# XXX needs vala<=0.10, ours is too new
# Don't compile the vala (useless) sample plugin.
CONFIGURE_ARGS += --disable-vala
USE_GROFF = Yes
# XXX requires libmtp >= 0.3
CONFIGURE_ARGS += --without-mtp
# requires libmtp >= 0.3
CONFIGURE_ARGS+= --without-mtp
# XXX requires media-keys support (i.e. pulseaudio) in gnome-settings-daemon
CONFIGURE_ARGS += --disable-mmkeys
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
# XXX requires new clutter-{x11,gst,gtk} and libmx
CONFIGURE_ARGS += --disable-visualizer
# XXX TODO: plugins subpackage
CONFIGURE_ARGS+= --disable-browser-plugin
CONFIGURE_ENV+= MOZILLA_PLUGINDIR=${PREFIX}/lib/mozilla-plugins
# XXX plugins subpackage?
CONFIGURE_ARGS += --disable-browser-plugin
CONFIGURE_ENV += MOZILLA_PLUGINDIR=${PREFIX}/lib/mozilla-plugins
REGRESS_IS_INTERACTIVE= x11
# WRKBUILD/tests
REGRESS_IS_INTERACTIVE= x11
post-install:
# needs media-keys support in G-S-D
find ${PREFIX} -type d -name mmkeys | xargs -r rm -rf
# needs gnome-keyring python bindings (py-gnome-desktop)
find ${PREFIX} -type d -name magnatune | xargs -r rm -rf
# needs ZeitgeistClient
find ${PREFIX} -type d -name rbzeitgeist | xargs -r rm -rf
### XXX remove this chunk when updating to a 'real' release ############
MASTER_SITES= http://distfiles.bsdfrog.org/
WRKDIST= ${WRKDIR}/rhythmbox
BUILD_DEPENDS += x11/gnome/common \
devel/autoconf/${AUTOCONF_VERSION} \
devel/automake/${AUTOMAKE_VERSION} \
textproc/gtk-doc \
devel/libtool
AUTOCONF_VERSION= 2.65
AUTOMAKE_VERSION= 1.11
CONFIGURE_STYLE= none
do-configure:
@cd ${WRKSRC} && \
AUTOCONF_VERSION=${AUTOCONF_VERSION} \
AUTOMAKE_VERSION=${AUTOMAKE_VERSION} \
./autogen.sh ${CONFIGURE_ARGS} --disable-maintainer-mode \
--disable-silent-rules
### end XXX ############################################################
.include <bsd.port.mk>

10
audio/rhythmbox/distinfo
View File

@ -1,5 +1,5 @@
MD5 (rhythmbox-0.12.8.tar.bz2) = PiQQgRkmSgy9i0zL13Mhcw==
RMD160 (rhythmbox-0.12.8.tar.bz2) = By1PoGQI68GBtAFH2xV10O9Mmf4=
SHA1 (rhythmbox-0.12.8.tar.bz2) = XSeSPMKbgde/vHPYZ9eXalKV+WQ=
SHA256 (rhythmbox-0.12.8.tar.bz2) = F1L6sTWAiqeKmv3nhEjpkgIMWMB3AfQ8mJ+6v8Y1IhM=
SIZE (rhythmbox-0.12.8.tar.bz2) = 5358950
MD5 (rhythmbox-2.90.1.1.tar.xz) = VshMSSAUP/JRaDkUU/1RBQ==
RMD160 (rhythmbox-2.90.1.1.tar.xz) = KCgj+gCc/2lUZ/8wV0r46ydekJw=
SHA1 (rhythmbox-2.90.1.1.tar.xz) = RHaMUO5l4uZ4qlUfZSEMaVfHBLY=
SHA256 (rhythmbox-2.90.1.1.tar.xz) = tMdM3UllWobWqS2PDkhCWPs9ybG5s538IB/v0+6p6Uk=
SIZE (rhythmbox-2.90.1.1.tar.xz) = 5616088

106
audio/rhythmbox/patches/patch-configure
View File

@ -1,106 +0,0 @@
$OpenBSD: patch-configure,v 1.10 2010/09/19 14:48:18 ajacoutot Exp $
audiocd plugin requires cdda support in gvfs which we do not provide as
this would require HAL or gudev.
--- configure.orig Sun Sep 19 12:13:26 2010
+++ configure Sun Sep 19 12:14:01 2010
@@ -15456,98 +15456,6 @@ fi
-pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GSTCDDA" >&5
-$as_echo_n "checking for GSTCDDA... " >&6; }
-
-if test -n "$PKG_CONFIG"; then
- if test -n "$GSTCDDA_CFLAGS"; then
- pkg_cv_GSTCDDA_CFLAGS="$GSTCDDA_CFLAGS"
- else
- if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gstreamer-cdda-0.10\""; } >&5
- ($PKG_CONFIG --exists --print-errors "gstreamer-cdda-0.10") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; then
- pkg_cv_GSTCDDA_CFLAGS=`$PKG_CONFIG --cflags "gstreamer-cdda-0.10" 2>/dev/null`
-else
- pkg_failed=yes
-fi
- fi
-else
- pkg_failed=untried
-fi
-if test -n "$PKG_CONFIG"; then
- if test -n "$GSTCDDA_LIBS"; then
- pkg_cv_GSTCDDA_LIBS="$GSTCDDA_LIBS"
- else
- if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gstreamer-cdda-0.10\""; } >&5
- ($PKG_CONFIG --exists --print-errors "gstreamer-cdda-0.10") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; then
- pkg_cv_GSTCDDA_LIBS=`$PKG_CONFIG --libs "gstreamer-cdda-0.10" 2>/dev/null`
-else
- pkg_failed=yes
-fi
- fi
-else
- pkg_failed=untried
-fi
-
-
-
-if test $pkg_failed = yes; then
-
-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
- _pkg_short_errors_supported=yes
-else
- _pkg_short_errors_supported=no
-fi
- if test $_pkg_short_errors_supported = yes; then
- GSTCDDA_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gstreamer-cdda-0.10"`
- else
- GSTCDDA_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gstreamer-cdda-0.10"`
- fi
- # Put the nasty error message in config.log where it belongs
- echo "$GSTCDDA_PKG_ERRORS" >&5
-
- as_fn_error "Package requirements (gstreamer-cdda-0.10) were not met:
-
-$GSTCDDA_PKG_ERRORS
-
-Consider adjusting the PKG_CONFIG_PATH environment variable if you
-installed software in a non-standard prefix.
-
-Alternatively, you may set the environment variables GSTCDDA_CFLAGS
-and GSTCDDA_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-" "$LINENO" 5
-elif test $pkg_failed = untried; then
- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "The pkg-config script could not be found or is too old. Make sure it
-is in your PATH or set the PKG_CONFIG environment variable to the full
-path to pkg-config.
-
-Alternatively, you may set the environment variables GSTCDDA_CFLAGS
-and GSTCDDA_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details." "$LINENO" 5; }
-else
- GSTCDDA_CFLAGS=$pkg_cv_GSTCDDA_CFLAGS
- GSTCDDA_LIBS=$pkg_cv_GSTCDDA_LIBS
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
- :
-fi
-
-
-
have_sj_metadata_getter=no
# Check whether --enable-musicbrainz was given.
if test "${enable_musicbrainz+set}" = set; then :

19
audio/rhythmbox/patches/patch-configure_ac Normal file
View File

@ -0,0 +1,19 @@
$OpenBSD: patch-configure_ac,v 1.4 2011/09/12 07:26:18 ajacoutot Exp $
audiocd plugin requires cdda support in gvfs which we do not provide as
this would require HAL or gudev.
--- configure.ac.orig Mon Aug 22 23:08:28 2011
+++ configure.ac Wed Aug 31 11:41:22 2011
@@ -342,11 +342,6 @@ fi
AC_CHECK_LIB(z, uncompress)
-dnl check for libgstcdda, needed to list the audio tracks
-PKG_CHECK_MODULES(GSTCDDA, gstreamer-cdda-0.10)
-AC_SUBST(GSTCDDA_LIBS)
-AC_SUBST(GSTCDDA_CFLAGS)
-
dnl check for MusicBrainz
have_sj_metadata_getter=no
AC_ARG_ENABLE(musicbrainz, AC_HELP_STRING([--disable-musicbrainz],

8
audio/rhythmbox/patches/patch-data_ui_rhythmbox-ui_xml
View File

@ -1,15 +1,15 @@
$OpenBSD: patch-data_ui_rhythmbox-ui_xml,v 1.1 2010/09/19 14:48:18 ajacoutot Exp $
$OpenBSD: patch-data_ui_rhythmbox-ui_xml,v 1.2 2011/09/12 07:26:18 ajacoutot Exp $
audiocd plugin requires cdda support in gvfs which we do not provide as
this would require HAL or gudev.
--- data/ui/rhythmbox-ui.xml.orig Sun Sep 19 14:03:36 2010
+++ data/ui/rhythmbox-ui.xml Sun Sep 19 14:04:02 2010
--- data/ui/rhythmbox-ui.xml.orig Sat Jul 23 09:20:55 2011
+++ data/ui/rhythmbox-ui.xml Sat Jul 23 09:21:27 2011
@@ -4,8 +4,6 @@
<menuitem name="MusicImportFileMenu" action="MusicImportFile"/>
<menuitem name="MusicImportFolderMenu" action="MusicImportFolder"/>
<separator/>
- <menuitem name="MusicScanMedia" action="MusicScanMedia"/>
- <menuitem name="MusicCheckDevices" action="MusicCheckDevices"/>
- <separator/>
<menu name="PlaylistMenu" action="Playlist">
<menuitem name="MusicPlaylistNewPlaylistMenu" action="MusicPlaylistNewPlaylist"/>

13
graphics/evince/patches/patch-configure → audio/rhythmbox/patches/patch-macros_gsettings_m4
View File

@ -1,12 +1,11 @@
$OpenBSD: patch-configure,v 1.1 2010/10/14 14:31:01 ajacoutot Exp $
$OpenBSD: patch-macros_gsettings_m4,v 1.1 2011/09/12 07:26:18 ajacoutot Exp $
Bug 627126 - gsettings schema files don't get installed on FreeBSD
glib commit 136e705e8383ff8848e425ac01278102d7badc52
--- configure.orig Thu Oct 14 12:39:54 2010
+++ configure Thu Oct 14 12:41:45 2010
@@ -18418,22 +18418,10 @@ install-data-am: install-gsettings-schemas
--- macros/gsettings.m4.orig Sun Jul 24 09:01:22 2011
+++ macros/gsettings.m4 Sun Jul 24 09:02:18 2011
@@ -36,22 +36,10 @@ install-data-am: install-gsettings-schemas
.SECONDARY: $(gsettings_SCHEMAS)
@ -14,11 +13,11 @@ glib commit 136e705e8383ff8848e425ac01278102d7badc52
- sed "$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g" | \
- sed "$$!N;$$!N;$$!N;$$!N;s/\n/ /g"
-
-install-gsettings-schemas: $(gsettings_SCHEMAS:.xml=.valid) $(gsettings__enum_file)
-install-gsettings-schemas: $(gsettings_SCHEMAS:.xml=.valid)
+install-gsettings-schemas: $(gsettings_SCHEMAS) $(gsettings__enum_file)
@$(NORMAL_INSTALL)
test -z "$(gsettingsschemadir)" || $(MKDIR_P) "$(DESTDIR)$(gsettingsschemadir)"
- @list='\''$(gsettings__enum_file) $(gsettings_SCHEMAS)'\''; test -n "$(gsettingsschemadir)" || list=; \
- @list='\''$(gsettings_SCHEMAS)'\''; test -n "$(gsettingsschemadir)" || list=; \
- for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- echo "$$d$$p"; \

2
audio/rhythmbox/patches/patch-metadata_test-metadata_c
View File

@ -1,4 +1,4 @@
$OpenBSD: patch-metadata_test-metadata_c,v 1.4 2009/07/12 20:05:23 ajacoutot Exp $
$OpenBSD: patch-metadata_test-metadata_c,v 1.5 2011/09/12 07:26:18 ajacoutot Exp $
--- metadata/test-metadata.c.orig Tue Jun 30 01:38:57 2009
+++ metadata/test-metadata.c Mon Jul 6 08:36:00 2009
@@ -92,7 +92,7 @@ load_metadata_cb (gpointer file)

11
audio/rhythmbox/patches/patch-plugins_Makefile_am Normal file
View File

@ -0,0 +1,11 @@
$OpenBSD: patch-plugins_Makefile_am,v 1.1 2011/09/12 07:26:18 ajacoutot Exp $
--- plugins/Makefile.am.orig Sat Jul 23 09:18:28 2011
+++ plugins/Makefile.am Sat Jul 23 09:18:37 2011
@@ -2,7 +2,6 @@ pluginincludedir = $(includedir)/rhythmbox/plugins
plugininclude_HEADERS = rb-plugin-macros.h
SUBDIRS = \
- audiocd \
dbus-media-server \
generic-player \
iradio \

25
audio/rhythmbox/patches/patch-plugins_Makefile_in
View File

@ -1,25 +0,0 @@
$OpenBSD: patch-plugins_Makefile_in,v 1.1 2010/09/19 14:48:18 ajacoutot Exp $
audiocd plugin requires cdda support in gvfs which we do not provide as
this would require HAL or gudev.
--- plugins/Makefile.in.orig Sun Sep 19 12:12:32 2010
+++ plugins/Makefile.in Sun Sep 19 12:12:42 2010
@@ -96,7 +96,7 @@ AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=
distdir
ETAGS = etags
CTAGS = ctags
-DIST_SUBDIRS = audiocd audioscrobbler generic-player iradio mmkeys \
+DIST_SUBDIRS = audioscrobbler generic-player iradio mmkeys \
power-manager sample status-icon visualizer lirc pythonconsole \
sample-python artdisplay lyrics magnatune jamendo coherence \
im-status context sendto replaygain rb sample-vala ipod \
@@ -354,7 +354,7 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-SUBDIRS = audiocd audioscrobbler generic-player iradio mmkeys \
+SUBDIRS = audioscrobbler generic-player iradio mmkeys \
power-manager sample status-icon visualizer $(am__append_1) \
$(am__append_2) $(am__append_3) $(am__append_4) \
$(am__append_5) $(am__append_6) $(am__append_7) \

12
audio/rhythmbox/patches/patch-plugins_audioscrobbler_rb-audioscrobbler_c
View File

@ -1,7 +1,11 @@
$OpenBSD: patch-plugins_audioscrobbler_rb-audioscrobbler_c,v 1.8 2010/03/21 10:10:56 ajacoutot Exp $
--- plugins/audioscrobbler/rb-audioscrobbler.c.orig Sun Feb 28 14:35:20 2010
+++ plugins/audioscrobbler/rb-audioscrobbler.c Wed Mar 3 11:24:33 2010
@@ -729,7 +729,7 @@ rb_audioscrobbler_should_handshake (RBAudioscrobbler *
$OpenBSD: patch-plugins_audioscrobbler_rb-audioscrobbler_c,v 1.9 2011/09/12 07:26:19 ajacoutot Exp $
audiocd plugin requires cdda support in gvfs which we do not provide as
this would require HAL or gudev.
--- plugins/audioscrobbler/rb-audioscrobbler.c.orig Mon May 2 13:42:44 2011
+++ plugins/audioscrobbler/rb-audioscrobbler.c Sat Jul 23 09:16:42 2011
@@ -829,7 +829,7 @@ rb_audioscrobbler_should_handshake (RBAudioscrobbler *
}
if (time (NULL) < audioscrobbler->priv->handshake_next) {

15
audio/rhythmbox/patches/patch-plugins_coherence_upnp_coherence_MediaPlayer_py
View File

@ -1,15 +0,0 @@
$OpenBSD: patch-plugins_coherence_upnp_coherence_MediaPlayer_py,v 1.1 2010/03/21 10:10:56 ajacoutot Exp $
The 'louie' module from coherence is not under MODPY_LIBDIR.
--- plugins/coherence/upnp_coherence/MediaPlayer.py.orig Tue Feb 9 10:45:09 2010
+++ plugins/coherence/upnp_coherence/MediaPlayer.py Tue Feb 9 10:45:18 2010
@@ -13,7 +13,7 @@ import rhythmdb
from coherence.upnp.core.soap_service import errorCode
from coherence.upnp.core import DIDLLite
-import louie
+import coherence.extern.louie as louie
from coherence.extern.simple_plugin import Plugin

15
audio/rhythmbox/patches/patch-plugins_coherence_upnp_coherence_MediaStore_py
View File

@ -1,15 +0,0 @@
$OpenBSD: patch-plugins_coherence_upnp_coherence_MediaStore_py,v 1.1 2010/03/21 10:10:56 ajacoutot Exp $
The 'louie' module from coherence is not under MODPY_LIBDIR.
--- plugins/coherence/upnp_coherence/MediaStore.py.orig Tue Feb 9 10:45:24 2010
+++ plugins/coherence/upnp_coherence/MediaStore.py Tue Feb 9 10:45:32 2010
@@ -6,7 +6,7 @@
import os.path
import rhythmdb
-import louie
+import coherence.extern.louie as louie
import urllib
from coherence import __version_info__

15
audio/rhythmbox/patches/patch-plugins_coherence_upnp_coherence___init___py
View File

@ -1,15 +0,0 @@
$OpenBSD: patch-plugins_coherence_upnp_coherence___init___py,v 1.1 2010/03/21 10:10:56 ajacoutot Exp $
The 'louie' module from coherence is not under MODPY_LIBDIR.
--- plugins/coherence/upnp_coherence/__init__.py.orig Tue Feb 9 10:44:50 2010
+++ plugins/coherence/upnp_coherence/__init__.py Tue Feb 9 10:45:02 2010
@@ -12,7 +12,7 @@ import gobject, gtk
import gconf
-import louie
+import coherence.extern.louie as louie
from coherence import log

16
audio/rhythmbox/patches/patch-plugins_status-icon_rb-status-icon-plugin_c
View File

@ -1,16 +0,0 @@
$OpenBSD: patch-plugins_status-icon_rb-status-icon-plugin_c,v 1.1 2011/04/21 07:04:56 ajacoutot Exp $
Fix with libnotify>=0.7
(notify_notification_new has lost its widget argument)
--- plugins/status-icon/rb-status-icon-plugin.c.orig Tue Apr 19 11:04:06 2011
+++ plugins/status-icon/rb-status-icon-plugin.c Tue Apr 19 11:04:16 2011
@@ -394,7 +394,7 @@ do_notify (RBStatusIconPlugin *plugin,
icon_name = NULL;
if (plugin->priv->notification == NULL) {
- plugin->priv->notification = notify_notification_new (primary, secondary, icon_name, NULL);
+ plugin->priv->notification = notify_notification_new (primary, secondary, icon_name);
g_signal_connect_object (plugin->priv->notification,
"closed",

16
audio/rhythmbox/patches/patch-plugins_status-icon_rb-tray-icon-gtk_c
View File

@ -1,16 +0,0 @@
$OpenBSD: patch-plugins_status-icon_rb-tray-icon-gtk_c,v 1.1 2011/04/21 07:04:56 ajacoutot Exp $
Fix with libnotify>=0.7
(notify_notification_attach_to_widget is gone)
--- plugins/status-icon/rb-tray-icon-gtk.c.orig Tue Apr 19 11:25:10 2011
+++ plugins/status-icon/rb-tray-icon-gtk.c Tue Apr 19 11:25:56 2011
@@ -343,7 +343,7 @@ rb_tray_icon_is_embedded (RBTrayIcon *tray)
void
rb_tray_icon_attach_notification (RBTrayIcon *tray, NotifyNotification *notification)
{
- notify_notification_attach_to_status_icon (notification, tray->priv->icon);
+// notify_notification_attach_to_status_icon (notification, tray->priv->icon);
}
#endif

45
audio/rhythmbox/patches/patch-remote_dbus_rb-client_c
View File

@ -1,45 +0,0 @@
$OpenBSD: patch-remote_dbus_rb-client_c,v 1.1 2010/09/29 07:42:59 ajacoutot Exp $
From bd389d8e8a2b1f3a914dcd4bb17e75fb8837d78a Mon Sep 17 00:00:00 2001
From: Jonathan Matthew <jonathan@d14n.org>
Date: Tue, 01 Jun 2010 00:55:27 +0000
Subject: rb-client: rename 'pause' to avoid conflict with pause(2) (bug #620199)
--- remote/dbus/rb-client.c.orig Thu Mar 25 01:10:14 2010
+++ remote/dbus/rb-client.c Wed Sep 29 09:11:04 2010
@@ -54,7 +54,7 @@ static gboolean previous = FALSE;
static gboolean notify = FALSE;
static gboolean play = FALSE;
-static gboolean pause = FALSE;
+static gboolean do_pause = FALSE;
static gboolean play_pause = FALSE;
static gboolean stop = FALSE;
@@ -91,7 +91,7 @@ static GOptionEntry args[] = {
{ "notify", 0, 0, G_OPTION_ARG_NONE, &notify, N_("Show notification of the playing song"), NULL },
{ "play", 0, 0, G_OPTION_ARG_NONE, &play, N_("Resume playback if currently paused"), NULL },
- { "pause", 0, 0, G_OPTION_ARG_NONE, &pause, N_("Pause playback if currently playing"), NULL },
+ { "pause", 0, 0, G_OPTION_ARG_NONE, &do_pause, N_("Pause playback if currently playing"), NULL },
{ "play-pause", 0, 0, G_OPTION_ARG_NONE, &play_pause, N_("Toggle play/pause mode"), NULL },
/* { "stop", 0, 0, G_OPTION_ARG_NONE, &stop, N_("Stop playback"), NULL }, */
@@ -608,7 +608,7 @@ main (int argc, char **argv)
if (next || previous ||
clear_queue ||
play_uri || other_stuff ||
- play || pause || play_pause || stop ||
+ play || do_pause || play_pause || stop ||
print_playing || print_playing_format || notify ||
(set_volume > -0.01) || volume_up || volume_down || print_volume || mute || unmute || (set_rating > -0.01))
no_present = TRUE;
@@ -696,7 +696,7 @@ main (int argc, char **argv)
org_gnome_Rhythmbox_Player_get_playing (player_proxy, &is_playing, &error);
if (!annoy (&error)) {
rb_debug ("playback state: %d", is_playing);
- if (play || pause || play_pause) {
+ if (play || do_pause || play_pause) {
if (is_playing != play || play_pause) {
rb_debug ("calling playPause to change playback state");
org_gnome_Rhythmbox_Player_play_pause (player_proxy, FALSE, &error);

47
audio/rhythmbox/patches/patch-shell_main_c
View File

@ -1,47 +0,0 @@
$OpenBSD: patch-shell_main_c,v 1.6 2010/09/25 18:13:13 ajacoutot Exp $
From 4394826f36fad0ad36ea773b6d4525dfcfcd389b Mon Sep 17 00:00:00 2001
From: Jonathan Matthew <jonathan@d14n.org>
Date: Wed, 05 May 2010 12:58:26 +0000
Subject: python: fix a number of python initialization problems (bug #617587)
- pygtk.require("2.8") doesn't work - it's only after a major version,
so we should pass in "2.0" instead
- init_pygobject() is deprecated, use pygobject_init (and pass in the
version we require) instead
- init_pygtk() is a macro that returns from the current function on
error, so we need to call it from a separate function for our error
handling to work
- if some aspect of python initialization failed, we were still using
the pygobject GIL macros, which were crashing
--- shell/main.c.orig Thu Mar 25 01:10:15 2010
+++ shell/main.c Sat Sep 25 19:55:32 2010
@@ -35,6 +35,7 @@
#define NO_IMPORT_PYGOBJECT
#define NO_IMPORT_PYGTK
#include <pygobject.h>
+#include "rb-python-module.h"
/* make sure it's defined somehow */
#ifndef _XOPEN_SOURCE
@@ -327,11 +328,15 @@ main (int argc, char **argv)
rb_profile_start ("mainloop");
#ifdef ENABLE_PYTHON
- pyg_begin_allow_threads;
-#endif
+ if (rb_python_init_successful ()) {
+ pyg_begin_allow_threads;
+ gtk_main ();
+ pyg_end_allow_threads;
+ } else {
+ gtk_main ();
+ }
+#else
gtk_main ();
-#ifdef ENABLE_PYTHON
- pyg_end_allow_threads;
#endif
rb_profile_end ("mainloop");

124
audio/rhythmbox/patches/patch-shell_rb-python-module_c
View File

@ -1,124 +0,0 @@
$OpenBSD: patch-shell_rb-python-module_c,v 1.1 2010/09/25 18:13:13 ajacoutot Exp $
From 4394826f36fad0ad36ea773b6d4525dfcfcd389b Mon Sep 17 00:00:00 2001
From: Jonathan Matthew <jonathan@d14n.org>
Date: Wed, 05 May 2010 12:58:26 +0000
Subject: python: fix a number of python initialization problems (bug #617587)
- pygtk.require("2.8") doesn't work - it's only after a major version,
so we should pass in "2.0" instead
- init_pygobject() is deprecated, use pygobject_init (and pass in the
version we require) instead
- init_pygtk() is a macro that returns from the current function on
error, so we need to call it from a separate function for our error
handling to work
- if some aspect of python initialization failed, we were still using
the pygobject GIL macros, which were crashing
--- shell/rb-python-module.c.orig Thu Mar 25 01:10:15 2010
+++ shell/rb-python-module.c Sat Sep 25 19:55:32 2010
@@ -113,8 +113,16 @@ extern PyMethodDef pyrb_functions[];
/* We retreive this to check for correct class hierarchy */
static PyTypeObject *PyRBPlugin_Type;
+static gboolean python_init_successful;
+
G_DEFINE_TYPE (RBPythonModule, rb_python_module, G_TYPE_TYPE_MODULE);
+static void
+actually_init_pygtk (void)
+{
+ init_pygtk ();
+}
+
void
rb_python_module_init_python (void)
{
@@ -127,6 +135,7 @@ rb_python_module_init_python (void)
char *argv[] = { "rb", "rhythmdb", NULL };
GList *paths;
+ python_init_successful = FALSE;
if (Py_IsInitialized ()) {
g_warning ("Python Should only be initialized once, since it's in class_init");
g_return_if_reached ();
@@ -159,7 +168,7 @@ rb_python_module_init_python (void)
PySys_SetArgv (1, argv);
- /* pygtk.require("2.8") */
+ /* pygtk.require("2.0") */
pygtk = PyImport_ImportModule ("pygtk");
if (pygtk == NULL) {
g_warning ("Could not import pygtk");
@@ -169,11 +178,15 @@ rb_python_module_init_python (void)
mdict = PyModule_GetDict (pygtk);
require = PyDict_GetItemString (mdict, "require");
- PyObject_CallObject (require, Py_BuildValue ("(S)", PyString_FromString ("2.8")));
+ PyObject_CallObject (require, Py_BuildValue ("(S)", PyString_FromString ("2.0")));
+ if (PyErr_Occurred ()) {
+ g_warning ("pygtk.require(2.0) failed");
+ PyErr_Print();
+ return;
+ }
/* import gobject */
- init_pygobject ();
- if (PyErr_Occurred ()) {
+ if (pygobject_init (2, 16, 0) == NULL) {
g_warning ("Could not initialize pygobject");
PyErr_Print();
return;
@@ -188,7 +201,7 @@ rb_python_module_init_python (void)
#endif
/* import gtk */
- init_pygtk ();
+ actually_init_pygtk ();
if (PyErr_Occurred ()) {
g_warning ("Could not initialize pygtk");
PyErr_Print();
@@ -206,7 +219,7 @@ rb_python_module_init_python (void)
mdict = PyModule_GetDict (gtk);
pygtk_version = PyDict_GetItemString (mdict, "pygtk_version");
- pygtk_required_version = Py_BuildValue ("(iii)", 2, 4, 0);
+ pygtk_required_version = Py_BuildValue ("(iii)", 2, 8, 0);
if (PyObject_Compare (pygtk_version, pygtk_required_version) == -1) {
g_warning("PyGTK %s required, but %s found.",
PyString_AsString (PyObject_Repr (pygtk_required_version)),
@@ -298,6 +311,8 @@ rb_python_module_init_python (void)
gettext_args = Py_BuildValue ("ss", GETTEXT_PACKAGE, GNOMELOCALEDIR);
PyObject_CallObject (install, gettext_args);
Py_DECREF (gettext_args);
+
+ python_init_successful = TRUE;
}
static gboolean
@@ -363,6 +378,11 @@ rb_python_module_load_with_gil (GTypeModule *module)
PyGILState_STATE state;
gboolean ret;
+ if (python_init_successful == FALSE) {
+ g_warning ("unable to load module as python runtime could not be initialized");
+ return FALSE;
+ }
+
state = pyg_gil_state_ensure ();
ret = rb_python_module_load (module);
pyg_gil_state_release (state);
@@ -517,6 +537,12 @@ rb_python_module_new (const gchar *path,
g_type_module_set_name (G_TYPE_MODULE (result), module);
return result;
+}
+
+gboolean
+rb_python_init_successful (void)
+{
+ return python_init_successful;
}
/* --- these are not module methods, they are here out of convenience --- */

28
audio/rhythmbox/patches/patch-shell_rb-python-module_h
View File

@ -1,28 +0,0 @@
$OpenBSD: patch-shell_rb-python-module_h,v 1.1 2010/09/25 18:13:13 ajacoutot Exp $
From 4394826f36fad0ad36ea773b6d4525dfcfcd389b Mon Sep 17 00:00:00 2001
From: Jonathan Matthew <jonathan@d14n.org>
Date: Wed, 05 May 2010 12:58:26 +0000
Subject: python: fix a number of python initialization problems (bug #617587)
- pygtk.require("2.8") doesn't work - it's only after a major version,
so we should pass in "2.0" instead
- init_pygobject() is deprecated, use pygobject_init (and pass in the
version we require) instead
- init_pygtk() is a macro that returns from the current function on
error, so we need to call it from a separate function for our error
handling to work
- if some aspect of python initialization failed, we were still using
the pygobject GIL macros, which were crashing
--- shell/rb-python-module.h.orig Thu Mar 25 01:10:15 2010
+++ shell/rb-python-module.h Sat Sep 25 19:55:32 2010
@@ -60,6 +60,8 @@ GObject *rb_python_module_new_object (RBPythonModul
void rb_python_module_init_python (void);
+gboolean rb_python_init_successful (void);
+
void rb_python_garbage_collect (void);
void rb_python_shutdown (void);

19
audio/rhythmbox/patches/patch-shell_rb-shell-player_c
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-shell_rb-shell-player_c,v 1.10 2010/03/28 10:48:50 ajacoutot Exp $
--- shell/rb-shell-player.c.orig Thu Mar 25 01:10:15 2010
+++ shell/rb-shell-player.c Sun Mar 28 12:03:06 2010
@@ -788,10 +788,8 @@ rb_shell_player_open_playlist_url (RBShellPlayer *play
$OpenBSD: patch-shell_rb-shell-player_c,v 1.11 2011/09/12 07:26:19 ajacoutot Exp $
--- shell/rb-shell-player.c.orig Mon May 2 13:42:44 2011
+++ shell/rb-shell-player.c Sat Jul 23 09:16:42 2011
@@ -777,10 +777,8 @@ rb_shell_player_open_playlist_url (RBShellPlayer *play
rb_player_play (player->priv->mmplayer, play_type, player->priv->track_transition_time, &error);
if (error) {
@ -12,7 +12,7 @@ $OpenBSD: patch-shell_rb-shell-player_c,v 1.10 2010/03/28 10:48:50 ajacoutot Exp
}
}
@@ -863,7 +861,9 @@ rb_shell_player_handle_eos_unlocked (RBShellPlayer *pl
@@ -852,7 +850,9 @@ rb_shell_player_handle_eos_unlocked (RBShellPlayer *pl
/* we're handling an unexpected EOS here, so crossfading isn't
* really possible anyway -> specify FALSE.
*/
@ -22,13 +22,14 @@ $OpenBSD: patch-shell_rb-shell-player_c,v 1.10 2010/03/28 10:48:50 ajacoutot Exp
g_free (location);
break;
}
@@ -1552,7 +1552,9 @@ open_location_thread (OpenLocationThreadData *data)
} else {
@@ -1586,8 +1586,10 @@ open_location_thread (OpenLocationThreadData *data)
default:
/* if we can't parse it as a playlist, just try playing it */
rb_debug ("playlist parser failed, playing %s directly", data->location);
+ GDK_THREADS_ENTER ();
rb_debug ("playlist parser failed, playing %s directly", data->location);
rb_shell_player_open_playlist_url (data->player, data->location, data->entry, data->play_type);
+ GDK_THREADS_LEAVE ();
break;
}
g_free (data);

17
audio/rhythmbox/pkg/DESCR
View File

@ -1,13 +1,4 @@
Rhythmbox is your one-stop multimedia application, supporting a music
library, multiple playlists, internet radio, and more. It has a number
of features, including:
* Easy to use music browser
* Searching and sorting
* Comprehensive audio format support through GStreamer
* Internet Radio support including last.fm streams
* Playlists
* Display audio visualizations
* Display album art and song lyrics downloaded from the internet
* Automatically download audio podcasts
* Browse, preview, and download albums from Magnatune and Jamendo
Rhythmbox is an integrated music management application, originally
inspired by Apple's iTunes. It is free software, designed to work well
under the GNOME Desktop, and based on the powerful GStreamer media
framework.

509
audio/rhythmbox/pkg/PLIST
View File

@ -1,8 +1,82 @@
@comment $OpenBSD: PLIST,v 1.22 2010/09/19 14:48:18 ajacoutot Exp $
@comment $OpenBSD: PLIST,v 1.23 2011/09/12 07:26:19 ajacoutot Exp $
@bin bin/rhythmbox
@bin bin/rhythmbox-client
include/rhythmbox/
include/rhythmbox/backends/
include/rhythmbox/backends/rb-encoder.h
include/rhythmbox/backends/rb-player-gst-data-tee.h
include/rhythmbox/backends/rb-player-gst-filter.h
include/rhythmbox/backends/rb-player-gst-tee.h
include/rhythmbox/backends/rb-player.h
include/rhythmbox/lib/
include/rhythmbox/lib/libmediaplayerid/
include/rhythmbox/lib/libmediaplayerid/mediaplayerid.h
include/rhythmbox/lib/rb-builder-helpers.h
include/rhythmbox/lib/rb-debug.h
include/rhythmbox/lib/rb-file-helpers.h
include/rhythmbox/lib/rb-stock-icons.h
include/rhythmbox/lib/rb-string-value-map.h
include/rhythmbox/lib/rb-util.h
include/rhythmbox/metadata/
include/rhythmbox/metadata/rb-metadata.h
include/rhythmbox/plugins/
include/rhythmbox/plugins/rb-plugin-macros.h
include/rhythmbox/podcast/
include/rhythmbox/podcast/rb-podcast-entry-types.h
include/rhythmbox/podcast/rb-podcast-manager.h
include/rhythmbox/podcast/rb-podcast-parse.h
include/rhythmbox/rhythmdb/
include/rhythmbox/rhythmdb/rb-refstring.h
include/rhythmbox/rhythmdb/rhythmdb-entry-type.h
include/rhythmbox/rhythmdb/rhythmdb-entry.h
include/rhythmbox/rhythmdb/rhythmdb-import-job.h
include/rhythmbox/rhythmdb/rhythmdb-property-model.h
include/rhythmbox/rhythmdb/rhythmdb-query-model.h
include/rhythmbox/rhythmdb/rhythmdb-query-result-list.h
include/rhythmbox/rhythmdb/rhythmdb-query-results.h
include/rhythmbox/rhythmdb/rhythmdb.h
include/rhythmbox/shell/
include/rhythmbox/shell/rb-history.h
include/rhythmbox/shell/rb-play-order.h
include/rhythmbox/shell/rb-playlist-manager.h
include/rhythmbox/shell/rb-removable-media-manager.h
include/rhythmbox/shell/rb-shell-player.h
include/rhythmbox/shell/rb-shell-preferences.h
include/rhythmbox/shell/rb-shell.h
include/rhythmbox/shell/rb-track-transfer-batch.h
include/rhythmbox/shell/rb-track-transfer-queue.h
include/rhythmbox/sources/
include/rhythmbox/sources/rb-auto-playlist-source.h
include/rhythmbox/sources/rb-browser-source.h
include/rhythmbox/sources/rb-display-page-group.h
include/rhythmbox/sources/rb-display-page-model.h
include/rhythmbox/sources/rb-display-page-tree.h
include/rhythmbox/sources/rb-display-page.h
include/rhythmbox/sources/rb-media-player-source.h
include/rhythmbox/sources/rb-playlist-source.h
include/rhythmbox/sources/rb-playlist-xml.h
include/rhythmbox/sources/rb-removable-media-source.h
include/rhythmbox/sources/rb-source-search-basic.h
include/rhythmbox/sources/rb-source-search.h
include/rhythmbox/sources/rb-source.h
include/rhythmbox/sources/rb-static-playlist-source.h
include/rhythmbox/sources/rb-streaming-source.h
include/rhythmbox/widgets/
include/rhythmbox/widgets/rb-alert-dialog.h
include/rhythmbox/widgets/rb-cell-renderer-pixbuf.h
include/rhythmbox/widgets/rb-cell-renderer-rating.h
include/rhythmbox/widgets/rb-dialog.h
include/rhythmbox/widgets/rb-entry-view.h
include/rhythmbox/widgets/rb-library-browser.h
include/rhythmbox/widgets/rb-property-view.h
include/rhythmbox/widgets/rb-rating.h
include/rhythmbox/widgets/rb-segmented-bar.h
include/rhythmbox/widgets/rb-song-info.h
include/rhythmbox/widgets/rb-uri-dialog.h
lib/girepository-1.0/MPID-3.0.typelib
lib/girepository-1.0/RB-3.0.typelib
lib/librhythmbox-core.la
@lib lib/librhythmbox-core.so.${LIBrhythmbox-core_VERSION}
lib/pkgconfig/rhythmbox.pc
lib/rhythmbox/
lib/rhythmbox/plugins/
lib/rhythmbox/plugins/artdisplay/
@ -24,18 +98,13 @@ lib/rhythmbox/plugins/artdisplay/MusicBrainzCoverArtSearch.pyo
lib/rhythmbox/plugins/artdisplay/PodcastCoverArtSearch.py
lib/rhythmbox/plugins/artdisplay/PodcastCoverArtSearch.pyc
lib/rhythmbox/plugins/artdisplay/PodcastCoverArtSearch.pyo
lib/rhythmbox/plugins/artdisplay/__init__.py
lib/rhythmbox/plugins/artdisplay/__init__.pyc
lib/rhythmbox/plugins/artdisplay/__init__.pyo
lib/rhythmbox/plugins/artdisplay/artdisplay.rb-plugin
lib/rhythmbox/plugins/artdisplay/lastfm_red_small.png
lib/rhythmbox/plugins/artdisplay/rhythmbox-missing-artwork.svg
lib/rhythmbox/plugins/artdisplay/artdisplay.plugin
lib/rhythmbox/plugins/artdisplay/artdisplay.py
lib/rhythmbox/plugins/artdisplay/artdisplay.pyc
lib/rhythmbox/plugins/artdisplay/artdisplay.pyo
lib/rhythmbox/plugins/audioscrobbler/
lib/rhythmbox/plugins/audioscrobbler/as-icon.png
lib/rhythmbox/plugins/audioscrobbler/audioscrobbler-prefs.ui
lib/rhythmbox/plugins/audioscrobbler/audioscrobbler-ui.xml
lib/rhythmbox/plugins/audioscrobbler/audioscrobbler.rb-plugin
lib/rhythmbox/plugins/audioscrobbler/libaudioscrobbler.la
lib/rhythmbox/plugins/audioscrobbler/audioscrobbler.plugin
@comment lib/rhythmbox/plugins/audioscrobbler/libaudioscrobbler.la
lib/rhythmbox/plugins/audioscrobbler/libaudioscrobbler.so
lib/rhythmbox/plugins/context/
lib/rhythmbox/plugins/context/AlbumTab.py
@ -50,54 +119,37 @@ lib/rhythmbox/plugins/context/ContextView.pyo
lib/rhythmbox/plugins/context/LastFM.py
lib/rhythmbox/plugins/context/LastFM.pyc
lib/rhythmbox/plugins/context/LastFM.pyo
lib/rhythmbox/plugins/context/LinksTab.py
lib/rhythmbox/plugins/context/LinksTab.pyc
lib/rhythmbox/plugins/context/LinksTab.pyo
lib/rhythmbox/plugins/context/LyricsTab.py
lib/rhythmbox/plugins/context/LyricsTab.pyc
lib/rhythmbox/plugins/context/LyricsTab.pyo
lib/rhythmbox/plugins/context/__init__.py
lib/rhythmbox/plugins/context/__init__.pyc
lib/rhythmbox/plugins/context/__init__.pyo
lib/rhythmbox/plugins/context/context.rb-plugin
lib/rhythmbox/plugins/context/img/
lib/rhythmbox/plugins/context/img/lastfm.png
lib/rhythmbox/plugins/context/img/spinner.gif
lib/rhythmbox/plugins/context/tmpl/
lib/rhythmbox/plugins/context/tmpl/album-tmpl.html
lib/rhythmbox/plugins/context/tmpl/artist-tmpl.html
lib/rhythmbox/plugins/context/tmpl/loading.html
lib/rhythmbox/plugins/context/tmpl/lyrics-tmpl.html
lib/rhythmbox/plugins/context/tmpl/main.css
lib/rhythmbox/plugins/daap/
lib/rhythmbox/plugins/daap/daap-prefs.ui
lib/rhythmbox/plugins/daap/daap-ui.xml
lib/rhythmbox/plugins/daap/daap.rb-plugin
lib/rhythmbox/plugins/daap/libdaap.la
lib/rhythmbox/plugins/daap/libdaap.so
lib/rhythmbox/plugins/daap/rb-daap-glue.h
lib/rhythmbox/plugins/context/context.plugin
lib/rhythmbox/plugins/context/context.py
lib/rhythmbox/plugins/context/context.pyc
lib/rhythmbox/plugins/context/context.pyo
lib/rhythmbox/plugins/dbus-media-server/
lib/rhythmbox/plugins/dbus-media-server/dbus-media-server.plugin
@comment lib/rhythmbox/plugins/dbus-media-server/libdbus-media-server.la
lib/rhythmbox/plugins/dbus-media-server/libdbus-media-server.so
lib/rhythmbox/plugins/generic-player/
lib/rhythmbox/plugins/generic-player/generic-player-info.ui
lib/rhythmbox/plugins/generic-player/generic-player-ui.xml
lib/rhythmbox/plugins/generic-player/generic-player.rb-plugin
lib/rhythmbox/plugins/generic-player/libgeneric-player.la
lib/rhythmbox/plugins/generic-player/generic-player.plugin
@comment lib/rhythmbox/plugins/generic-player/libgeneric-player.la
lib/rhythmbox/plugins/generic-player/libgeneric-player.so
lib/rhythmbox/plugins/im-status/
lib/rhythmbox/plugins/im-status/__init__.py
lib/rhythmbox/plugins/im-status/__init__.pyc
lib/rhythmbox/plugins/im-status/__init__.pyo
lib/rhythmbox/plugins/im-status/im-status.rb-plugin
lib/rhythmbox/plugins/im-status/im-status.plugin
lib/rhythmbox/plugins/im-status/im-status.py
lib/rhythmbox/plugins/im-status/im-status.pyc
lib/rhythmbox/plugins/im-status/im-status.pyo
lib/rhythmbox/plugins/ipod/
lib/rhythmbox/plugins/ipod/ipod-info.ui
lib/rhythmbox/plugins/ipod/ipod-init.ui
lib/rhythmbox/plugins/ipod/ipod-ui.xml
lib/rhythmbox/plugins/ipod/ipod.rb-plugin
lib/rhythmbox/plugins/ipod/libipod.la
lib/rhythmbox/plugins/ipod/ipod.plugin
@comment lib/rhythmbox/plugins/ipod/libipod.la
lib/rhythmbox/plugins/ipod/libipod.so
lib/rhythmbox/plugins/iradio/
lib/rhythmbox/plugins/iradio/iradio-initial.pls
lib/rhythmbox/plugins/iradio/iradio-ui.xml
lib/rhythmbox/plugins/iradio/iradio.rb-plugin
lib/rhythmbox/plugins/iradio/libiradio.la
lib/rhythmbox/plugins/iradio/iradio.plugin
@comment lib/rhythmbox/plugins/iradio/libiradio.la
lib/rhythmbox/plugins/iradio/libiradio.so
lib/rhythmbox/plugins/iradio/station-properties.ui
lib/rhythmbox/plugins/jamendo/
lib/rhythmbox/plugins/jamendo/JamendoConfigureDialog.py
lib/rhythmbox/plugins/jamendo/JamendoConfigureDialog.pyc
@ -108,18 +160,17 @@ lib/rhythmbox/plugins/jamendo/JamendoSaxHandler.pyo
lib/rhythmbox/plugins/jamendo/JamendoSource.py
lib/rhythmbox/plugins/jamendo/JamendoSource.pyc
lib/rhythmbox/plugins/jamendo/JamendoSource.pyo
lib/rhythmbox/plugins/jamendo/__init__.py
lib/rhythmbox/plugins/jamendo/__init__.pyc
lib/rhythmbox/plugins/jamendo/__init__.pyo
lib/rhythmbox/plugins/jamendo/jamendo-loading.ui
lib/rhythmbox/plugins/jamendo/jamendo-prefs.ui
lib/rhythmbox/plugins/jamendo/jamendo.rb-plugin
lib/rhythmbox/plugins/jamendo/jamendo_logo.png
lib/rhythmbox/plugins/jamendo/jamendo_logo_medium.png
lib/rhythmbox/plugins/jamendo/jamendo.plugin
lib/rhythmbox/plugins/jamendo/jamendo.py
lib/rhythmbox/plugins/jamendo/jamendo.pyc
lib/rhythmbox/plugins/jamendo/jamendo.pyo
lib/rhythmbox/plugins/lyrics/
lib/rhythmbox/plugins/lyrics/AstrawebParser.py
lib/rhythmbox/plugins/lyrics/AstrawebParser.pyc
lib/rhythmbox/plugins/lyrics/AstrawebParser.pyo
lib/rhythmbox/plugins/lyrics/DarkLyricsParser.py
lib/rhythmbox/plugins/lyrics/DarkLyricsParser.pyc
lib/rhythmbox/plugins/lyrics/DarkLyricsParser.pyo
lib/rhythmbox/plugins/lyrics/LeoslyricsParser.py
lib/rhythmbox/plugins/lyrics/LeoslyricsParser.pyc
lib/rhythmbox/plugins/lyrics/LeoslyricsParser.pyo
@ -144,42 +195,27 @@ lib/rhythmbox/plugins/lyrics/TerraParser.pyo
lib/rhythmbox/plugins/lyrics/WinampcnParser.py
lib/rhythmbox/plugins/lyrics/WinampcnParser.pyc
lib/rhythmbox/plugins/lyrics/WinampcnParser.pyo
lib/rhythmbox/plugins/lyrics/__init__.py
lib/rhythmbox/plugins/lyrics/__init__.pyc
lib/rhythmbox/plugins/lyrics/__init__.pyo
lib/rhythmbox/plugins/lyrics/lyrics-prefs.ui
lib/rhythmbox/plugins/lyrics/lyrics.rb-plugin
lib/rhythmbox/plugins/magnatune/
lib/rhythmbox/plugins/magnatune/BuyAlbumHandler.py
lib/rhythmbox/plugins/magnatune/BuyAlbumHandler.pyc
lib/rhythmbox/plugins/magnatune/BuyAlbumHandler.pyo
lib/rhythmbox/plugins/magnatune/MagnatuneSource.py
lib/rhythmbox/plugins/magnatune/MagnatuneSource.pyc
lib/rhythmbox/plugins/magnatune/MagnatuneSource.pyo
lib/rhythmbox/plugins/magnatune/TrackListHandler.py
lib/rhythmbox/plugins/magnatune/TrackListHandler.pyc
lib/rhythmbox/plugins/magnatune/TrackListHandler.pyo
lib/rhythmbox/plugins/magnatune/__init__.py
lib/rhythmbox/plugins/magnatune/__init__.pyc
lib/rhythmbox/plugins/magnatune/__init__.pyo
lib/rhythmbox/plugins/magnatune/magnatune-loading.ui
lib/rhythmbox/plugins/magnatune/magnatune-prefs.ui
lib/rhythmbox/plugins/magnatune/magnatune.rb-plugin
lib/rhythmbox/plugins/magnatune/magnatune_logo_color_small.png
lib/rhythmbox/plugins/magnatune/magnatune_logo_color_tiny.png
lib/rhythmbox/plugins/mmkeys/
lib/rhythmbox/plugins/mmkeys/libmmkeys.la
lib/rhythmbox/plugins/mmkeys/libmmkeys.so
lib/rhythmbox/plugins/mmkeys/mmkeys.rb-plugin
lib/rhythmbox/plugins/lyrics/lyrics.plugin
lib/rhythmbox/plugins/lyrics/lyrics.py
lib/rhythmbox/plugins/lyrics/lyrics.pyc
lib/rhythmbox/plugins/lyrics/lyrics.pyo
lib/rhythmbox/plugins/mpris/
@comment lib/rhythmbox/plugins/mpris/libmpris.la
lib/rhythmbox/plugins/mpris/libmpris.so
lib/rhythmbox/plugins/mpris/mpris.plugin
lib/rhythmbox/plugins/notification/
@comment lib/rhythmbox/plugins/notification/libnotification.la
lib/rhythmbox/plugins/notification/libnotification.so
lib/rhythmbox/plugins/notification/notification.plugin
lib/rhythmbox/plugins/power-manager/
lib/rhythmbox/plugins/power-manager/libpower-manager.la
@comment lib/rhythmbox/plugins/power-manager/libpower-manager.la
lib/rhythmbox/plugins/power-manager/libpower-manager.so
lib/rhythmbox/plugins/power-manager/power-manager.rb-plugin
lib/rhythmbox/plugins/power-manager/power-manager.plugin
lib/rhythmbox/plugins/python-console/
lib/rhythmbox/plugins/python-console/pythonconsole.plugin
lib/rhythmbox/plugins/python-console/pythonconsole.py
lib/rhythmbox/plugins/python-console/pythonconsole.pyc
lib/rhythmbox/plugins/python-console/pythonconsole.pyo
lib/rhythmbox/plugins/python-console/pythonconsole.rb-plugin
lib/rhythmbox/plugins/rb/
lib/rhythmbox/plugins/rb/Coroutine.py
lib/rhythmbox/plugins/rb/Coroutine.pyc
@ -190,61 +226,38 @@ lib/rhythmbox/plugins/rb/Loader.pyo
lib/rhythmbox/plugins/rb/URLCache.py
lib/rhythmbox/plugins/rb/URLCache.pyc
lib/rhythmbox/plugins/rb/URLCache.pyo
lib/rhythmbox/plugins/rb/__init__.py
lib/rhythmbox/plugins/rb/__init__.pyc
lib/rhythmbox/plugins/rb/__init__.pyo
lib/rhythmbox/plugins/rb/rb.plugin
lib/rhythmbox/plugins/rb/rb.py
lib/rhythmbox/plugins/rb/rb.pyc
lib/rhythmbox/plugins/rb/rb.pyo
lib/rhythmbox/plugins/rb/stringmatch.py
lib/rhythmbox/plugins/rb/stringmatch.pyc
lib/rhythmbox/plugins/rb/stringmatch.pyo
lib/rhythmbox/plugins/replaygain/
lib/rhythmbox/plugins/replaygain/__init__.py
lib/rhythmbox/plugins/replaygain/__init__.pyc
lib/rhythmbox/plugins/replaygain/__init__.pyo
lib/rhythmbox/plugins/replaygain/config.py
lib/rhythmbox/plugins/replaygain/config.pyc
lib/rhythmbox/plugins/replaygain/config.pyo
lib/rhythmbox/plugins/replaygain/player.py
lib/rhythmbox/plugins/replaygain/player.pyc
lib/rhythmbox/plugins/replaygain/player.pyo
lib/rhythmbox/plugins/replaygain/replaygain-prefs.ui
lib/rhythmbox/plugins/replaygain/replaygain.rb-plugin
lib/rhythmbox/plugins/replaygain/replaygain.plugin
lib/rhythmbox/plugins/replaygain/replaygain.py
lib/rhythmbox/plugins/replaygain/replaygain.pyc
lib/rhythmbox/plugins/replaygain/replaygain.pyo
lib/rhythmbox/plugins/sendto/
lib/rhythmbox/plugins/sendto/__init__.py
lib/rhythmbox/plugins/sendto/__init__.pyc
lib/rhythmbox/plugins/sendto/__init__.pyo
lib/rhythmbox/plugins/sendto/sendto.rb-plugin
lib/rhythmbox/plugins/status-icon/
lib/rhythmbox/plugins/status-icon/libstatus-icon.la
lib/rhythmbox/plugins/status-icon/libstatus-icon.so
lib/rhythmbox/plugins/status-icon/status-icon-preferences.ui
lib/rhythmbox/plugins/status-icon/status-icon-ui.xml
lib/rhythmbox/plugins/status-icon/status-icon.rb-plugin
lib/rhythmbox/plugins/upnp_coherence/
lib/rhythmbox/plugins/upnp_coherence/MediaPlayer.py
lib/rhythmbox/plugins/upnp_coherence/MediaPlayer.pyc
lib/rhythmbox/plugins/upnp_coherence/MediaPlayer.pyo
lib/rhythmbox/plugins/upnp_coherence/MediaStore.py
lib/rhythmbox/plugins/upnp_coherence/MediaStore.pyc
lib/rhythmbox/plugins/upnp_coherence/MediaStore.pyo
lib/rhythmbox/plugins/upnp_coherence/UpnpSource.py
lib/rhythmbox/plugins/upnp_coherence/UpnpSource.pyc
lib/rhythmbox/plugins/upnp_coherence/UpnpSource.pyo
lib/rhythmbox/plugins/upnp_coherence/__init__.py
lib/rhythmbox/plugins/upnp_coherence/__init__.pyc
lib/rhythmbox/plugins/upnp_coherence/__init__.pyo
lib/rhythmbox/plugins/upnp_coherence/coherence.rb-plugin
lib/rhythmbox/plugins/visualizer/
lib/rhythmbox/plugins/visualizer/libvisualizer.la
lib/rhythmbox/plugins/visualizer/libvisualizer.so
lib/rhythmbox/plugins/visualizer/rb-visualizer-glue.h
lib/rhythmbox/plugins/visualizer/visualizer-controls.ui
lib/rhythmbox/plugins/visualizer/visualizer-ui.xml
lib/rhythmbox/plugins/visualizer/visualizer.rb-plugin
lib/rhythmbox/plugins/sendto/sendto.plugin
lib/rhythmbox/plugins/sendto/sendto.py
lib/rhythmbox/plugins/sendto/sendto.pyc
lib/rhythmbox/plugins/sendto/sendto.pyo
@bin libexec/rhythmbox-metadata
@man man/man1/rhythmbox-client.1
@man man/man1/rhythmbox.1
share/applications/rhythmbox-device.desktop
share/applications/rhythmbox.desktop
share/dbus-1/services/org.gnome.Rhythmbox.service
share/gir-1.0/MPID-3.0.gir
share/gir-1.0/RB-3.0.gir
share/glib-2.0/schemas/org.gnome.rhythmbox.gschema.xml
share/gnome/
share/gnome/help/
share/gnome/help/rhythmbox/
share/gnome/help/rhythmbox/C/
share/gnome/help/rhythmbox/C/fdl-appendix.xml
@ -344,6 +357,22 @@ share/gnome/help/rhythmbox/es/figures/rb-volume-changer.png
share/gnome/help/rhythmbox/es/figures/rb-window-small.png
share/gnome/help/rhythmbox/es/figures/rb-window.png
share/gnome/help/rhythmbox/es/rhythmbox.xml
share/gnome/help/rhythmbox/eu/
share/gnome/help/rhythmbox/eu/figures/
share/gnome/help/rhythmbox/eu/figures/rb-iradio-main.png
share/gnome/help/rhythmbox/eu/figures/rb-notification-area-menu.png
share/gnome/help/rhythmbox/eu/figures/rb-notification-window.png
share/gnome/help/rhythmbox/eu/figures/rb-notification-zone.png
share/gnome/help/rhythmbox/eu/figures/rb-podcast-main.png
share/gnome/help/rhythmbox/eu/figures/rb-statusbar.png
share/gnome/help/rhythmbox/eu/figures/rb-toolbar-prevplaynext.png
share/gnome/help/rhythmbox/eu/figures/rb-toolbar-repeat.png
share/gnome/help/rhythmbox/eu/figures/rb-toolbar-shuffle.png
share/gnome/help/rhythmbox/eu/figures/rb-toolbar.png
share/gnome/help/rhythmbox/eu/figures/rb-volume-changer.png
share/gnome/help/rhythmbox/eu/figures/rb-window-small.png
share/gnome/help/rhythmbox/eu/figures/rb-window.png
share/gnome/help/rhythmbox/eu/rhythmbox.xml
share/gnome/help/rhythmbox/fr/
share/gnome/help/rhythmbox/fr/figures/
share/gnome/help/rhythmbox/fr/figures/rb-iradio-main.png
@ -360,6 +389,22 @@ share/gnome/help/rhythmbox/fr/figures/rb-volume-changer.png
share/gnome/help/rhythmbox/fr/figures/rb-window-small.png
share/gnome/help/rhythmbox/fr/figures/rb-window.png
share/gnome/help/rhythmbox/fr/rhythmbox.xml
share/gnome/help/rhythmbox/gl/
share/gnome/help/rhythmbox/gl/figures/
share/gnome/help/rhythmbox/gl/figures/rb-iradio-main.png
share/gnome/help/rhythmbox/gl/figures/rb-notification-area-menu.png
share/gnome/help/rhythmbox/gl/figures/rb-notification-window.png
share/gnome/help/rhythmbox/gl/figures/rb-notification-zone.png
share/gnome/help/rhythmbox/gl/figures/rb-podcast-main.png
share/gnome/help/rhythmbox/gl/figures/rb-statusbar.png
share/gnome/help/rhythmbox/gl/figures/rb-toolbar-prevplaynext.png
share/gnome/help/rhythmbox/gl/figures/rb-toolbar-repeat.png
share/gnome/help/rhythmbox/gl/figures/rb-toolbar-shuffle.png
share/gnome/help/rhythmbox/gl/figures/rb-toolbar.png
share/gnome/help/rhythmbox/gl/figures/rb-volume-changer.png
share/gnome/help/rhythmbox/gl/figures/rb-window-small.png
share/gnome/help/rhythmbox/gl/figures/rb-window.png
share/gnome/help/rhythmbox/gl/rhythmbox.xml
share/gnome/help/rhythmbox/it/
share/gnome/help/rhythmbox/it/figures/
share/gnome/help/rhythmbox/it/figures/rb-iradio-main.png
@ -376,6 +421,22 @@ share/gnome/help/rhythmbox/it/figures/rb-volume-changer.png
share/gnome/help/rhythmbox/it/figures/rb-window-small.png
share/gnome/help/rhythmbox/it/figures/rb-window.png
share/gnome/help/rhythmbox/it/rhythmbox.xml
share/gnome/help/rhythmbox/ja/
share/gnome/help/rhythmbox/ja/figures/
share/gnome/help/rhythmbox/ja/figures/rb-iradio-main.png
share/gnome/help/rhythmbox/ja/figures/rb-notification-area-menu.png
share/gnome/help/rhythmbox/ja/figures/rb-notification-window.png
share/gnome/help/rhythmbox/ja/figures/rb-notification-zone.png
share/gnome/help/rhythmbox/ja/figures/rb-podcast-main.png
share/gnome/help/rhythmbox/ja/figures/rb-statusbar.png
share/gnome/help/rhythmbox/ja/figures/rb-toolbar-prevplaynext.png
share/gnome/help/rhythmbox/ja/figures/rb-toolbar-repeat.png
share/gnome/help/rhythmbox/ja/figures/rb-toolbar-shuffle.png
share/gnome/help/rhythmbox/ja/figures/rb-toolbar.png
share/gnome/help/rhythmbox/ja/figures/rb-volume-changer.png
share/gnome/help/rhythmbox/ja/figures/rb-window-small.png
share/gnome/help/rhythmbox/ja/figures/rb-window.png
share/gnome/help/rhythmbox/ja/rhythmbox.xml
share/gnome/help/rhythmbox/oc/
share/gnome/help/rhythmbox/oc/figures/
share/gnome/help/rhythmbox/oc/figures/rb-iradio-main.png
@ -408,6 +469,22 @@ share/gnome/help/rhythmbox/pt/figures/rb-volume-changer.png
share/gnome/help/rhythmbox/pt/figures/rb-window-small.png
share/gnome/help/rhythmbox/pt/figures/rb-window.png
share/gnome/help/rhythmbox/pt/rhythmbox.xml
share/gnome/help/rhythmbox/ro/
share/gnome/help/rhythmbox/ro/figures/
share/gnome/help/rhythmbox/ro/figures/rb-iradio-main.png
share/gnome/help/rhythmbox/ro/figures/rb-notification-area-menu.png
share/gnome/help/rhythmbox/ro/figures/rb-notification-window.png
share/gnome/help/rhythmbox/ro/figures/rb-notification-zone.png
share/gnome/help/rhythmbox/ro/figures/rb-podcast-main.png
share/gnome/help/rhythmbox/ro/figures/rb-statusbar.png
share/gnome/help/rhythmbox/ro/figures/rb-toolbar-prevplaynext.png
share/gnome/help/rhythmbox/ro/figures/rb-toolbar-repeat.png
share/gnome/help/rhythmbox/ro/figures/rb-toolbar-shuffle.png
share/gnome/help/rhythmbox/ro/figures/rb-toolbar.png
share/gnome/help/rhythmbox/ro/figures/rb-volume-changer.png
share/gnome/help/rhythmbox/ro/figures/rb-window-small.png
share/gnome/help/rhythmbox/ro/figures/rb-window.png
share/gnome/help/rhythmbox/ro/rhythmbox.xml
share/gnome/help/rhythmbox/ru/
share/gnome/help/rhythmbox/ru/figures/
share/gnome/help/rhythmbox/ru/figures/rb-iradio-main.png
@ -424,6 +501,22 @@ share/gnome/help/rhythmbox/ru/figures/rb-volume-changer.png
share/gnome/help/rhythmbox/ru/figures/rb-window-small.png
share/gnome/help/rhythmbox/ru/figures/rb-window.png
share/gnome/help/rhythmbox/ru/rhythmbox.xml
share/gnome/help/rhythmbox/sl/
share/gnome/help/rhythmbox/sl/figures/
share/gnome/help/rhythmbox/sl/figures/rb-iradio-main.png
share/gnome/help/rhythmbox/sl/figures/rb-notification-area-menu.png
share/gnome/help/rhythmbox/sl/figures/rb-notification-window.png
share/gnome/help/rhythmbox/sl/figures/rb-notification-zone.png
share/gnome/help/rhythmbox/sl/figures/rb-podcast-main.png
share/gnome/help/rhythmbox/sl/figures/rb-statusbar.png
share/gnome/help/rhythmbox/sl/figures/rb-toolbar-prevplaynext.png
share/gnome/help/rhythmbox/sl/figures/rb-toolbar-repeat.png
share/gnome/help/rhythmbox/sl/figures/rb-toolbar-shuffle.png
share/gnome/help/rhythmbox/sl/figures/rb-toolbar.png
share/gnome/help/rhythmbox/sl/figures/rb-volume-changer.png
share/gnome/help/rhythmbox/sl/figures/rb-window-small.png
share/gnome/help/rhythmbox/sl/figures/rb-window.png
share/gnome/help/rhythmbox/sl/rhythmbox.xml
share/gnome/help/rhythmbox/sv/
share/gnome/help/rhythmbox/sv/figures/
share/gnome/help/rhythmbox/sv/figures/rb-iradio-main.png
@ -472,90 +565,14 @@ share/gnome/help/rhythmbox/zh_CN/figures/rb-volume-changer.png
share/gnome/help/rhythmbox/zh_CN/figures/rb-window-small.png
share/gnome/help/rhythmbox/zh_CN/figures/rb-window.png
share/gnome/help/rhythmbox/zh_CN/rhythmbox.xml
share/gtk-doc/html/rhythmbox/
share/gtk-doc/html/rhythmbox/RBAutoPlaylistSource.html
share/gtk-doc/html/rhythmbox/RBBrowserSource.html
share/gtk-doc/html/rhythmbox/RBCellRendererPixbuf.html
share/gtk-doc/html/rhythmbox/RBCellRendererRating.html
share/gtk-doc/html/rhythmbox/RBEncoder.html
share/gtk-doc/html/rhythmbox/RBEntryView.html
share/gtk-doc/html/rhythmbox/RBHistory.html
share/gtk-doc/html/rhythmbox/RBImportErrorsSource.html
share/gtk-doc/html/rhythmbox/RBLibraryBrowser.html
share/gtk-doc/html/rhythmbox/RBLibrarySource.html
share/gtk-doc/html/rhythmbox/RBMetaData.html
share/gtk-doc/html/rhythmbox/RBMissingFilesSource.html
share/gtk-doc/html/rhythmbox/RBPlayOrder.html
share/gtk-doc/html/rhythmbox/RBPlayQueueSource.html
share/gtk-doc/html/rhythmbox/RBPlayer.html
share/gtk-doc/html/rhythmbox/RBPlayerGstDataTee.html
share/gtk-doc/html/rhythmbox/RBPlayerGstFilter.html
share/gtk-doc/html/rhythmbox/RBPlayerGstTee.html
share/gtk-doc/html/rhythmbox/RBPlaylistManager.html
share/gtk-doc/html/rhythmbox/RBPlaylistSource.html
share/gtk-doc/html/rhythmbox/RBPlugin.html
share/gtk-doc/html/rhythmbox/RBPropertyView.html
share/gtk-doc/html/rhythmbox/RBQueryCreator.html
share/gtk-doc/html/rhythmbox/RBRandomPlayOrder.html
share/gtk-doc/html/rhythmbox/RBRating.html
share/gtk-doc/html/rhythmbox/RBRemovableMediaManager.html
share/gtk-doc/html/rhythmbox/RBRemovableMediaSource.html
share/gtk-doc/html/rhythmbox/RBSearchEntry.html
share/gtk-doc/html/rhythmbox/RBShell.html
share/gtk-doc/html/rhythmbox/RBShellClipboard.html
share/gtk-doc/html/rhythmbox/RBShellPlayer.html
share/gtk-doc/html/rhythmbox/RBShellPreferences.html
share/gtk-doc/html/rhythmbox/RBSongInfo.html
share/gtk-doc/html/rhythmbox/RBSource.html
share/gtk-doc/html/rhythmbox/RBSourceHeader.html
share/gtk-doc/html/rhythmbox/RBSourceList.html
share/gtk-doc/html/rhythmbox/RBSourceListModel.html
share/gtk-doc/html/rhythmbox/RBSourceSearch.html
share/gtk-doc/html/rhythmbox/RBSourceSearchBasic.html
share/gtk-doc/html/rhythmbox/RBStaticPlaylistSource.html
share/gtk-doc/html/rhythmbox/RBStatusbar.html
share/gtk-doc/html/rhythmbox/RBStreamingSource.html
share/gtk-doc/html/rhythmbox/RBStringValueMap.html
share/gtk-doc/html/rhythmbox/RBURIDialog.html
share/gtk-doc/html/rhythmbox/RhythmDB.html
share/gtk-doc/html/rhythmbox/RhythmDBImportJob.html
share/gtk-doc/html/rhythmbox/RhythmDBPropertyModel.html
share/gtk-doc/html/rhythmbox/RhythmDBQueryModel.html
share/gtk-doc/html/rhythmbox/RhythmDBQueryResults.html
share/gtk-doc/html/rhythmbox/ch01.html
share/gtk-doc/html/rhythmbox/ch02.html
share/gtk-doc/html/rhythmbox/ch03.html
share/gtk-doc/html/rhythmbox/ch04.html
share/gtk-doc/html/rhythmbox/ch05.html
share/gtk-doc/html/rhythmbox/ch06.html
share/gtk-doc/html/rhythmbox/ch07.html
share/gtk-doc/html/rhythmbox/home.png
share/gtk-doc/html/rhythmbox/index.html
share/gtk-doc/html/rhythmbox/index.sgml
share/gtk-doc/html/rhythmbox/left.png
share/gtk-doc/html/rhythmbox/rhythmbox-RBSourceGroup.html
share/gtk-doc/html/rhythmbox/rhythmbox-rb-async-queue-watch.html
share/gtk-doc/html/rhythmbox/rhythmbox-rb-builder-helpers.html
share/gtk-doc/html/rhythmbox/rhythmbox-rb-debug.html
share/gtk-doc/html/rhythmbox/rhythmbox-rb-dialog.html
share/gtk-doc/html/rhythmbox/rhythmbox-rb-file-helpers.html
share/gtk-doc/html/rhythmbox/rhythmbox-rb-header.html
share/gtk-doc/html/rhythmbox/rhythmbox-rb-rating-helper.html
share/gtk-doc/html/rhythmbox/rhythmbox-rb-text-helpers.html
share/gtk-doc/html/rhythmbox/rhythmbox-rb-tree-dnd.html
share/gtk-doc/html/rhythmbox/rhythmbox-rb-util.html
share/gtk-doc/html/rhythmbox/rhythmbox.devhelp
share/gtk-doc/html/rhythmbox/rhythmbox.devhelp2
share/gtk-doc/html/rhythmbox/right.png
share/gtk-doc/html/rhythmbox/style.css
share/gtk-doc/html/rhythmbox/up.png
share/icons/hicolor/16x16/apps/rhythmbox.png
share/icons/hicolor/22x22/apps/rhythmbox.png
share/icons/hicolor/24x24/apps/rhythmbox.png
share/icons/hicolor/24x24/places/music-library.png
share/icons/hicolor/256x256/apps/rhythmbox.png
share/icons/hicolor/32x32/apps/rhythmbox.png
share/icons/hicolor/48x48/apps/rhythmbox.png
share/icons/hicolor/scalable/apps/rhythmbox.svg
share/icons/hicolor/scalable/apps/rhythmbox-symbolic.svg
share/locale/af/LC_MESSAGES/rhythmbox.mo
share/locale/am/LC_MESSAGES/rhythmbox.mo
share/locale/ar/LC_MESSAGES/rhythmbox.mo
@ -567,6 +584,7 @@ share/locale/bg/LC_MESSAGES/rhythmbox.mo
share/locale/bn_IN/LC_MESSAGES/rhythmbox.mo
share/locale/br/LC_MESSAGES/rhythmbox.mo
share/locale/ca/LC_MESSAGES/rhythmbox.mo
share/locale/ca@valencia/LC_MESSAGES/rhythmbox.mo
share/locale/cs/LC_MESSAGES/rhythmbox.mo
share/locale/cy/LC_MESSAGES/rhythmbox.mo
share/locale/da/LC_MESSAGES/rhythmbox.mo
@ -575,6 +593,7 @@ share/locale/dz/LC_MESSAGES/rhythmbox.mo
share/locale/el/LC_MESSAGES/rhythmbox.mo
share/locale/en_CA/LC_MESSAGES/rhythmbox.mo
share/locale/en_GB/LC_MESSAGES/rhythmbox.mo
share/locale/eo/LC_MESSAGES/rhythmbox.mo
share/locale/es/LC_MESSAGES/rhythmbox.mo
share/locale/et/LC_MESSAGES/rhythmbox.mo
share/locale/eu/LC_MESSAGES/rhythmbox.mo
@ -604,6 +623,7 @@ share/locale/nb/LC_MESSAGES/rhythmbox.mo
share/locale/nds/LC_MESSAGES/rhythmbox.mo
share/locale/ne/LC_MESSAGES/rhythmbox.mo
share/locale/nl/LC_MESSAGES/rhythmbox.mo
share/locale/nn/LC_MESSAGES/rhythmbox.mo
share/locale/oc/LC_MESSAGES/rhythmbox.mo
share/locale/or/LC_MESSAGES/rhythmbox.mo
share/locale/pa/LC_MESSAGES/rhythmbox.mo
@ -628,6 +648,11 @@ share/locale/vi/LC_MESSAGES/rhythmbox.mo
share/locale/zh_CN/LC_MESSAGES/rhythmbox.mo
share/locale/zh_HK/LC_MESSAGES/rhythmbox.mo
share/locale/zh_TW/LC_MESSAGES/rhythmbox.mo
share/man/
share/man/man1/
@man share/man/man1/rhythmbox-client.1
@man share/man/man1/rhythmbox.1
share/omf/
share/omf/rhythmbox/
share/omf/rhythmbox/rhythmbox-C.omf
share/omf/rhythmbox/rhythmbox-cs.omf
@ -635,11 +660,16 @@ share/omf/rhythmbox/rhythmbox-da.omf
share/omf/rhythmbox/rhythmbox-de.omf
share/omf/rhythmbox/rhythmbox-el.omf
share/omf/rhythmbox/rhythmbox-es.omf
share/omf/rhythmbox/rhythmbox-eu.omf
share/omf/rhythmbox/rhythmbox-fr.omf
share/omf/rhythmbox/rhythmbox-gl.omf
share/omf/rhythmbox/rhythmbox-it.omf
share/omf/rhythmbox/rhythmbox-ja.omf
share/omf/rhythmbox/rhythmbox-oc.omf
share/omf/rhythmbox/rhythmbox-pt.omf
share/omf/rhythmbox/rhythmbox-ro.omf
share/omf/rhythmbox/rhythmbox-ru.omf
share/omf/rhythmbox/rhythmbox-sl.omf
share/omf/rhythmbox/rhythmbox-sv.omf
share/omf/rhythmbox/rhythmbox-uk.omf
share/omf/rhythmbox/rhythmbox-zh_CN.omf
@ -667,7 +697,6 @@ share/rhythmbox/icons/hicolor/16x16/places/playlist-automatic.png
share/rhythmbox/icons/hicolor/16x16/places/playlist.png
share/rhythmbox/icons/hicolor/16x16/status/
share/rhythmbox/icons/hicolor/16x16/status/rhythmbox-no-star.png
share/rhythmbox/icons/hicolor/16x16/status/rhythmbox-notplaying.png
share/rhythmbox/icons/hicolor/16x16/status/rhythmbox-set-star.png
share/rhythmbox/icons/hicolor/16x16/status/rhythmbox-unset-star.png
share/rhythmbox/icons/hicolor/22x22/
@ -680,14 +709,11 @@ share/rhythmbox/icons/hicolor/22x22/actions/internet-radio-new.png
share/rhythmbox/icons/hicolor/22x22/actions/playlist-automatic-new.png
share/rhythmbox/icons/hicolor/22x22/actions/playlist-new.png
share/rhythmbox/icons/hicolor/22x22/actions/podcast-new.png
share/rhythmbox/icons/hicolor/22x22/actions/visualization.png
share/rhythmbox/icons/hicolor/22x22/places/
share/rhythmbox/icons/hicolor/22x22/places/library-internet-radio.png
share/rhythmbox/icons/hicolor/22x22/places/library-podcast.png
share/rhythmbox/icons/hicolor/22x22/places/playlist-automatic.png
share/rhythmbox/icons/hicolor/22x22/places/playlist.png
share/rhythmbox/icons/hicolor/22x22/status/
share/rhythmbox/icons/hicolor/22x22/status/rhythmbox-notplaying.png
share/rhythmbox/icons/hicolor/24x24/
share/rhythmbox/icons/hicolor/24x24/places/
share/rhythmbox/icons/hicolor/24x24/places/jamendo.png
@ -705,8 +731,6 @@ share/rhythmbox/icons/hicolor/32x32/places/
share/rhythmbox/icons/hicolor/32x32/places/library-internet-radio.png
share/rhythmbox/icons/hicolor/32x32/places/playlist-automatic.png
share/rhythmbox/icons/hicolor/32x32/places/playlist.png
share/rhythmbox/icons/hicolor/32x32/status/
share/rhythmbox/icons/hicolor/32x32/status/rhythmbox-notplaying.png
share/rhythmbox/icons/hicolor/scalable/
share/rhythmbox/icons/hicolor/scalable/actions/
share/rhythmbox/icons/hicolor/scalable/actions/audio-cd-duplicate.svg
@ -718,26 +742,69 @@ share/rhythmbox/icons/hicolor/scalable/places/
share/rhythmbox/icons/hicolor/scalable/places/library-internet-radio.svg
share/rhythmbox/icons/hicolor/scalable/places/playlist-automatic.svg
share/rhythmbox/icons/hicolor/scalable/places/playlist.svg
share/rhythmbox/icons/hicolor/scalable/status/
share/rhythmbox/icons/hicolor/scalable/status/rhythmbox-notplaying.svg
share/rhythmbox/library-prefs.ui
share/rhythmbox/media-player-properties.ui
share/rhythmbox/playback-prefs.ui
share/rhythmbox/playlist-save.ui
share/rhythmbox/playlists.xml
share/rhythmbox/plugins.ui
share/rhythmbox/plugins/
share/rhythmbox/plugins/artdisplay/
share/rhythmbox/plugins/artdisplay/lastfm_red_small.png
share/rhythmbox/plugins/artdisplay/rhythmbox-missing-artwork.svg
share/rhythmbox/plugins/audioscrobbler/
share/rhythmbox/plugins/audioscrobbler/Last.fm-icon.png
share/rhythmbox/plugins/audioscrobbler/Libre.fm-icon.png
share/rhythmbox/plugins/audioscrobbler/audioscrobbler-preferences.ui
share/rhythmbox/plugins/audioscrobbler/audioscrobbler-profile-ui.xml
share/rhythmbox/plugins/audioscrobbler/audioscrobbler-profile.ui
share/rhythmbox/plugins/audioscrobbler/audioscrobbler-radio-ui.xml
share/rhythmbox/plugins/context/
share/rhythmbox/plugins/context/img/
share/rhythmbox/plugins/context/img/Allmusic16x16.png
share/rhythmbox/plugins/context/img/Discogs16x16.png
share/rhythmbox/plugins/context/img/Wikipedia16x16.png
share/rhythmbox/plugins/context/img/lastfm.png
share/rhythmbox/plugins/context/img/spinner.gif
share/rhythmbox/plugins/context/tmpl/
share/rhythmbox/plugins/context/tmpl/album-tmpl.html
share/rhythmbox/plugins/context/tmpl/artist-tmpl.html
share/rhythmbox/plugins/context/tmpl/links-tmpl.html
share/rhythmbox/plugins/context/tmpl/loading.html
share/rhythmbox/plugins/context/tmpl/lyrics-tmpl.html
share/rhythmbox/plugins/context/tmpl/main.css
share/rhythmbox/plugins/generic-player/
share/rhythmbox/plugins/generic-player/generic-player-info.ui
share/rhythmbox/plugins/generic-player/generic-player-ui.xml
share/rhythmbox/plugins/ipod/
share/rhythmbox/plugins/ipod/ipod-info.ui
share/rhythmbox/plugins/ipod/ipod-init.ui
share/rhythmbox/plugins/ipod/ipod-ui.xml
share/rhythmbox/plugins/iradio/
share/rhythmbox/plugins/iradio/iradio-initial.xspf
share/rhythmbox/plugins/iradio/iradio-ui.xml
share/rhythmbox/plugins/iradio/station-properties.ui
share/rhythmbox/plugins/jamendo/
share/rhythmbox/plugins/jamendo/jamendo-loading.ui
share/rhythmbox/plugins/jamendo/jamendo-prefs.ui
share/rhythmbox/plugins/jamendo/jamendo_logo.png
share/rhythmbox/plugins/jamendo/jamendo_logo_medium.png
share/rhythmbox/plugins/lyrics/
share/rhythmbox/plugins/lyrics/lyrics-prefs.ui
share/rhythmbox/plugins/replaygain/
share/rhythmbox/plugins/replaygain/replaygain-prefs.ui
share/rhythmbox/podcast-feed-properties.ui
share/rhythmbox/podcast-prefs.ui
share/rhythmbox/podcast-properties.ui
share/rhythmbox/rhythmbox-ui.xml
share/rhythmbox/rhythmbox.gep
share/rhythmbox/song-info-multiple.ui
share/rhythmbox/song-info.ui
share/rhythmbox/sync-dialog.ui
share/rhythmbox/sync-state.ui
share/rhythmbox/uri-new.ui
@unexec GCONF_CONFIG_SOURCE=`%D/bin/gconftool-2 --get-default-source` %D/bin/gconftool-2 --makefile-uninstall-rule %D/${SCHEMAS_INSTDIR}/*.schemas > /dev/null
${SCHEMAS_INSTDIR}/
${SCHEMAS_INSTDIR}/rhythmbox.schemas
@exec GCONF_CONFIG_SOURCE=`%D/bin/gconftool-2 --get-default-source` %D/bin/gconftool-2 --makefile-install-rule %D/${SCHEMAS_INSTDIR}/*.schemas > /dev/null
@exec %D/bin/update-desktop-database
@unexec-delete %D/bin/update-desktop-database
@exec %D/bin/gtk-update-icon-cache -q -f -t %D/share/icons/hicolor 2> /dev/null || true
@unexec-delete %D/bin/gtk-update-icon-cache -q -f -t %D/share/icons/hicolor 2> /dev/null || true
@exec %D/bin/glib-compile-schemas %D/share/glib-2.0/schemas >/dev/null
@unexec-delete %D/bin/glib-compile-schemas %D/share/glib-2.0/schemas >/dev/null

77
databases/evolution-data-server/Makefile
View File

@ -1,26 +1,26 @@
# $OpenBSD: Makefile,v 1.89 2011/07/03 17:14:23 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.90 2011/09/12 07:26:19 ajacoutot Exp $
SHARED_ONLY= Yes
COMMENT= data backends for the Evolution mail/PIM suite
COMMENT= unified backend for PIM programs
GNOME_PROJECT= evolution-data-server
GNOME_VERSION= 2.32.3
GNOME_VERSION= 3.0.3
REVISION= 2
EXTRACT_SUFX= .tar.xz
CATEGORIES= databases
SHARED_LIBS += edataserver-1.2 11.0 # .14.0
SHARED_LIBS += ebackend-1.2 1.0 # .0.1
SHARED_LIBS += egroupwise-1.2 14.0 # .13.1
SHARED_LIBS += camel-1.2 15.0 # .19.0
SHARED_LIBS += camel-provider-1.2 15.0 # .19.0
SHARED_LIBS += ebook-1.2 13.0 # .13.1
SHARED_LIBS += edata-book-1.2 7.0 # .8.0
SHARED_LIBS += ecal-1.2 10.0 # .10.2
SHARED_LIBS += edata-cal-1.2 7.0 # .10.0
SHARED_LIBS += edataserverui-1.2 10.0 # .11.0
SHARED_LIBS += edataserver-1.2 12.0 # 14.0
SHARED_LIBS += ebackend-1.2 2.0 # 1.0
SHARED_LIBS += egroupwise-1.2 15.0 # 13.1
SHARED_LIBS += camel-1.2 16.0 # 23.0
SHARED_LIBS += camel-provider-1.2 16.0 # 23.0
SHARED_LIBS += ebook-1.2 14.0 # 13.1
SHARED_LIBS += edata-book-1.2 8.0 # 9.0
SHARED_LIBS += ecal-1.2 11.0 # 10.2
SHARED_LIBS += edata-cal-1.2 8.0 # 11.0
SHARED_LIBS += edataserverui-3.0 0.0 # 0.0
HOMEPAGE= http://www.gnome.org/projects/evolution/
@ -33,25 +33,25 @@ PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
WANTLIB += ORBit-2 X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext
WANTLIB += Xfixes Xi Xinerama Xrandr Xrender asn1 atk-1.0 c cairo
WANTLIB += com_err crypto dbus-1 expat fontconfig
WANTLIB += freetype gconf-2 gcrypt gdk-x11-2.0 gdk_pixbuf-2.0
WANTLIB += gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 gssapi
WANTLIB += gthread-2.0 gtk-x11-2.0 krb5 m nspr4 pango-1.0 pangocairo-1.0
WANTLIB += pangoft2-1.0 pcre pixman-1 plc4 plds4 png proxy pthread
WANTLIB += pthread-stubs sasl2 soup-2.4 soup-gnome-2.4 sqlite3
WANTLIB += ssl tasn1 xcb xcb-render xml2 z nssutil3
WANTLIB += db ldap-2.4 lber-2.4 gpg-error gnutls nss3>=19 smime3 ssl3 ical
WANTLIB += icalss icalvcal gnome-keyring>=6 gweather gdata
WANTLIB += GL Xxf86vm drm xcb-shm gmp hogweed nettle
WANTLIB += GL ORBit-2 X11 Xau Xcomposite Xcursor Xdamage Xdmcp
WANTLIB += Xext Xfixes Xi Xinerama Xrandr Xrender Xxf86vm asn1
WANTLIB += atk-1.0 c cairo cairo-gobject com_err crypto db dbus-1
WANTLIB += drm expat fontconfig freetype gconf-2 gcrypt gdata
WANTLIB += gdk-3 gdk_pixbuf-2.0 gio-2.0 glib-2.0 gmodule-2.0 gnome-keyring
WANTLIB += gobject-2.0 gpg-error gssapi gthread-2.0 gtk-3 gweather-3
WANTLIB += ical icalss icalvcal krb5 lber-2.4 ldap-2.4 m nspr4
WANTLIB += nss3 nssutil3 pango-1.0 pangocairo-1.0 pangoft2-1.0
WANTLIB += pcre pixman-1 plc4 plds4 png pthread pthread-stubs
WANTLIB += sasl2 smime3 soup-2.4 soup-gnome-2.4 sqlite3 ssl ssl3
WANTLIB += xcb xcb-render xcb-shm xml2 z
MODULES= devel/gettext \
lang/python \
x11/gnome
BUILD_DEPENDS= devel/bison \
devel/gperf
devel/gperf \
devel/gobject-introspection
LIB_DEPENDS= databases/db/v4 \
databases/openldap \
security/nss>=3.11.4p1 \
@ -60,13 +60,19 @@ LIB_DEPENDS= databases/db/v4 \
devel/libgdata>=0.8.0
YACC= bison
# Should be 2.66
AUTOCONF_VERSION= 2.65
CONFIGURE_STYLE= autoconf gnu
CONFIGURE_ARGS+= ${CONFIGURE_SHARED} \
--enable-gnome-keyring \
AUTOCONF_VERSION= 2.68
AUTOMAKE_VERSION= 1.9
CONFIGURE_STYLE= autoconf
CONFIGURE_ARGS= ${CONFIGURE_SHARED} \
--disable-gtk-doc \
--enable-introspection \
--enable-ssl \
--enable-smime \
--enable-ipv6 \
--enable-weather \
--enable-nntp \
--with-nss-libs="${LOCALBASE}/lib" \
--with-nss-includes="${LOCALBASE}/include/nss" \
--with-nspr-libs=${LOCALBASE}/lib \
@ -74,7 +80,7 @@ CONFIGURE_ARGS+= ${CONFIGURE_SHARED} \
--with-krb5 \
--with-krb5-libs=/usr/lib \
--with-krb5-includes=/usr/include/kerberosV \
--with-libdb="${PREFIX}/lib" \
--with-libdb="${LOCALBASE}/lib" \
--with-openldap=${LOCALBASE}
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/db4" \
LDFLAGS="-L${LOCALBASE}/lib -pthread"
@ -83,9 +89,6 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/db4" \
R= ${GNOME_VERSION:C/^([0-9]+\.[0-9]+).*/\1/}
SUBST_VARS= R
post-extract:
@perl -pi -e 's,/usr/bin/env python,${MODPY_BIN},' \
${WRKSRC}/addressbook/libebook/gen-western-table.py
@rm ${WRKSRC}/addressbook/backends/google/util.{c,h}
MODPY_ADJ_FILES= addressbook/libebook/gen-western-table.py
.include <bsd.port.mk>

10
databases/evolution-data-server/distinfo
View File

@ -1,5 +1,5 @@
MD5 (evolution-data-server-2.32.3.tar.bz2) = SAurBwKZFpL53un+z8SfSA==
RMD160 (evolution-data-server-2.32.3.tar.bz2) = rciweu9BqJ0W/EJlQcEhkKNoi48=
SHA1 (evolution-data-server-2.32.3.tar.bz2) = y/MsNDjE8WULNbhwB6M368HFbOw=
SHA256 (evolution-data-server-2.32.3.tar.bz2) = dEAmp0W3EbPjk7Yf7SHEkm0bEKOqfaZPSzOj479bCFw=
SIZE (evolution-data-server-2.32.3.tar.bz2) = 4322281
MD5 (evolution-data-server-3.0.3.tar.xz) = XhL7bRlbVyuFYJq3BLja9w==
RMD160 (evolution-data-server-3.0.3.tar.xz) = Co7CkyioMtgN2Cqb0VB7mnybqN0=
SHA1 (evolution-data-server-3.0.3.tar.xz) = xIvWLeyIQ2N7XpbO+mscALmiDW4=
SHA256 (evolution-data-server-3.0.3.tar.xz) = wjz7U8xiJP1hM5sdS/i96GkUnICM8xwpUpwPLdNkwDM=
SIZE (evolution-data-server-3.0.3.tar.xz) = 3583040

2
databases/evolution-data-server/patches/patch-addressbook_backends_file_e-book-backend-file_c
View File

@ -1,4 +1,4 @@
$OpenBSD: patch-addressbook_backends_file_e-book-backend-file_c,v 1.5 2010/09/30 07:32:09 ajacoutot Exp $
$OpenBSD: patch-addressbook_backends_file_e-book-backend-file_c,v 1.6 2011/09/12 07:26:19 ajacoutot Exp $
--- addressbook/backends/file/e-book-backend-file.c.orig Tue Sep 28 07:47:33 2010
+++ addressbook/backends/file/e-book-backend-file.c Tue Sep 28 07:49:03 2010
@@ -175,7 +175,7 @@ e_book_backend_file_create_unique_id (void)

17
databases/evolution-data-server/patches/patch-addressbook_backends_google_Makefile_am
View File

@ -1,17 +0,0 @@
$OpenBSD: patch-addressbook_backends_google_Makefile_am,v 1.1 2011/03/23 15:57:39 jasper Exp $
Sync with git master as of ef4f06cb7480f343008a4402669aa640e148870e,
which bumps libgdata dependency to 0.7.0 and merges util.c into
e-book-backend-google.c
--- addressbook/backends/google/Makefile.am.orig Wed Mar 23 15:57:42 2011
+++ addressbook/backends/google/Makefile.am Wed Mar 23 15:57:49 2011
@@ -12,8 +12,6 @@ libebookbackendgoogle_la_CPPFLAGS = \
$(GDATA_CFLAGS)
libebookbackendgoogle_la_SOURCES = \
- util.h \
- util.c \
e-book-backend-google-factory.c \
e-book-backend-google.h \
e-book-backend-google.c

48
databases/evolution-data-server/patches/patch-addressbook_backends_google_Makefile_in
View File

@ -1,48 +0,0 @@
$OpenBSD: patch-addressbook_backends_google_Makefile_in,v 1.1 2011/03/23 15:57:39 jasper Exp $
Sync with git master as of ef4f06cb7480f343008a4402669aa640e148870e,
which bumps libgdata dependency to 0.7.0 and merges util.c into
e-book-backend-google.c
--- addressbook/backends/google/Makefile.in.orig Wed Mar 23 16:07:07 2011
+++ addressbook/backends/google/Makefile.in Wed Mar 23 16:07:24 2011
@@ -84,7 +84,6 @@ libebookbackendgoogle_la_DEPENDENCIES = \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1)
am_libebookbackendgoogle_la_OBJECTS = \
- libebookbackendgoogle_la-util.lo \
libebookbackendgoogle_la-e-book-backend-google-factory.lo \
libebookbackendgoogle_la-e-book-backend-google.lo
libebookbackendgoogle_la_OBJECTS = \
@@ -404,8 +403,6 @@ libebookbackendgoogle_la_CPPFLAGS = \
$(GDATA_CFLAGS)
libebookbackendgoogle_la_SOURCES = \
- util.h \
- util.c \
e-book-backend-google-factory.c \
e-book-backend-google.h \
e-book-backend-google.c
@@ -498,7 +495,6 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libebookbackendgoogle_la-e-book-backend-google-factory.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libebookbackendgoogle_la-e-book-backend-google.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libebookbackendgoogle_la-util.Plo@am__quote@
.c.o:
@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
@@ -523,14 +519,6 @@ distclean-compile:
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
-
-libebookbackendgoogle_la-util.lo: util.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libebookbackendgoogle_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libebookbackendgoogle_la-util.lo -MD -MP -MF $(DEPDIR)/libebookbackendgoogle_la-util.Tpo -c -o libebookbackendgoogle_la-util.lo `test -f 'util.c' || echo '$(srcdir)/'`util.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libebookbackendgoogle_la-util.Tpo $(DEPDIR)/libebookbackendgoogle_la-util.Plo
-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='util.c' object='libebookbackendgoogle_la-util.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libebookbackendgoogle_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libebookbackendgoogle_la-util.lo `test -f 'util.c' || echo '$(srcdir)/'`util.c
libebookbackendgoogle_la-e-book-backend-google-factory.lo: e-book-backend-google-factory.c
@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libebookbackendgoogle_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libebookbackendgoogle_la-e-book-backend-google-factory.lo -MD -MP -MF $(DEPDIR)/libebookbackendgoogle_la-e-book-backend-google-factory.Tpo -c -o libebookbackendgoogle_la-e-book-backend-google-factory.lo `test -f 'e-book-backend-google-factory.c' || echo '$(srcdir)/'`e-book-backend-google-factory.c

2683
databases/evolution-data-server/patches/patch-addressbook_backends_google_e-book-backend-google_c
View File

File diff suppressed because it is too large Load Diff

8
databases/evolution-data-server/patches/patch-addressbook_backends_ldap_e-book-backend-ldap_c
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-addressbook_backends_ldap_e-book-backend-ldap_c,v 1.3 2011/03/29 11:20:02 ajacoutot Exp $
--- addressbook/backends/ldap/e-book-backend-ldap.c.orig Fri Oct 1 14:16:05 2010
+++ addressbook/backends/ldap/e-book-backend-ldap.c Tue Mar 29 12:29:16 2011
@@ -1204,11 +1204,11 @@ create_dn_from_contact (EContact *contact, gchar *root
$OpenBSD: patch-addressbook_backends_ldap_e-book-backend-ldap_c,v 1.4 2011/09/12 07:26:19 ajacoutot Exp $
--- addressbook/backends/ldap/e-book-backend-ldap.c.orig Tue Jul 26 09:35:39 2011
+++ addressbook/backends/ldap/e-book-backend-ldap.c Wed Aug 31 09:42:39 2011
@@ -1209,11 +1209,11 @@ create_dn_from_contact (EContact *contact, gchar *root
}
}

2
databases/evolution-data-server/patches/patch-addressbook_backends_vcf_e-book-backend-vcf_c
View File

@ -1,4 +1,4 @@
$OpenBSD: patch-addressbook_backends_vcf_e-book-backend-vcf_c,v 1.3 2010/09/30 07:32:09 ajacoutot Exp $
$OpenBSD: patch-addressbook_backends_vcf_e-book-backend-vcf_c,v 1.4 2011/09/12 07:26:19 ajacoutot Exp $
--- addressbook/backends/vcf/e-book-backend-vcf.c.orig Tue Sep 28 07:49:28 2010
+++ addressbook/backends/vcf/e-book-backend-vcf.c Tue Sep 28 07:49:42 2010
@@ -79,7 +79,7 @@ e_book_backend_vcf_create_unique_id (void)

16
databases/evolution-data-server/patches/patch-calendar_libedata-cal_Makefile_in
View File

@ -1,11 +1,11 @@
$OpenBSD: patch-calendar_libedata-cal_Makefile_in,v 1.2 2011/03/07 19:35:30 ajacoutot Exp $
--- calendar/libedata-cal/Makefile.in.orig Sun Feb 6 05:13:14 2011
+++ calendar/libedata-cal/Makefile.in Sat Feb 26 16:46:04 2011
@@ -603,8 +603,7 @@ test_intervaltree_coverage_LDADD = \
$(top_builddir)/calendar/libecal/libecal-1.2.la \
libedata-cal-1.2.la \
$(top_builddir)/libedataserver/libedataserver-1.2.la \
- $(EVOLUTION_CALENDAR_LIBS) \
$OpenBSD: patch-calendar_libedata-cal_Makefile_in,v 1.3 2011/09/12 07:26:19 ajacoutot Exp $
--- calendar/libedata-cal/Makefile.in.orig Wed Aug 31 07:36:10 2011
+++ calendar/libedata-cal/Makefile.in Wed Aug 31 09:42:42 2011
@@ -616,8 +616,7 @@ test_intervaltree_coverage_LDADD = \
libedata-cal-1.2.la \
$(top_builddir)/calendar/libecal/libecal-1.2.la \
$(top_builddir)/libedataserver/libedataserver-1.2.la \
- $(EVOLUTION_CALENDAR_LIBS) \
- -lgcov
+ $(EVOLUTION_CALENDAR_LIBS)

8
databases/evolution-data-server/patches/patch-calendar_libedata-cal_e-cal-backend-intervaltree_c
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-calendar_libedata-cal_e-cal-backend-intervaltree_c,v 1.3 2011/04/19 17:01:54 ajacoutot Exp $
--- calendar/libedata-cal/e-cal-backend-intervaltree.c.orig Tue Nov 23 04:26:37 2010
+++ calendar/libedata-cal/e-cal-backend-intervaltree.c Tue Apr 19 18:17:04 2011
@@ -593,8 +593,8 @@ e_intervaltree_node_dump (EIntervalTree *tree, EInterv
$OpenBSD: patch-calendar_libedata-cal_e-cal-backend-intervaltree_c,v 1.4 2011/09/12 07:26:19 ajacoutot Exp $
--- calendar/libedata-cal/e-cal-backend-intervaltree.c.orig Thu Mar 10 10:50:17 2011
+++ calendar/libedata-cal/e-cal-backend-intervaltree.c Tue May 17 13:40:32 2011
@@ -589,8 +589,8 @@ e_intervaltree_node_dump (EIntervalTree *tree, EInterv
*/
EIntervalTreePrivate *priv = tree->priv;
if (node != priv->nil)

8
databases/evolution-data-server/patches/patch-calendar_libedata-cal_e-cal-backend-sexp_c
View File

@ -1,8 +1,8 @@
$OpenBSD: patch-calendar_libedata-cal_e-cal-backend-sexp_c,v 1.2 2011/04/19 17:01:54 ajacoutot Exp $
--- calendar/libedata-cal/e-cal-backend-sexp.c.orig Tue Sep 28 07:53:05 2010
+++ calendar/libedata-cal/e-cal-backend-sexp.c Tue Sep 28 07:53:16 2010
$OpenBSD: patch-calendar_libedata-cal_e-cal-backend-sexp_c,v 1.3 2011/09/12 07:26:19 ajacoutot Exp $
--- calendar/libedata-cal/e-cal-backend-sexp.c.orig Sun Apr 24 18:52:16 2011
+++ calendar/libedata-cal/e-cal-backend-sexp.c Tue May 17 13:40:32 2011
@@ -1476,7 +1476,7 @@ test_query (const gchar * query)
gboolean generator = e_cal_backend_sexp_evaluate_occur_times(sexp, &start, &end);
gboolean generator = e_cal_backend_sexp_evaluate_occur_times (sexp, &start, &end);
if (generator) {
- printf ("%s: %ld - %ld\n", query, start, end);

2
databases/evolution-data-server/patches/patch-calendar_libedata-cal_test-intervaltree_c
View File

@ -1,4 +1,4 @@
$OpenBSD: patch-calendar_libedata-cal_test-intervaltree_c,v 1.4 2011/07/03 17:14:24 ajacoutot Exp $
$OpenBSD: patch-calendar_libedata-cal_test-intervaltree_c,v 1.5 2011/09/12 07:26:19 ajacoutot Exp $
--- calendar/libedata-cal/test-intervaltree.c.orig Tue Nov 23 04:26:37 2010
+++ calendar/libedata-cal/test-intervaltree.c Sat Feb 26 16:47:10 2011
@@ -162,7 +162,7 @@ create_test_component (time_t start, time_t end)

11
databases/evolution-data-server/patches/patch-camel_camel-block-file_h
View File

@ -1,11 +0,0 @@
$OpenBSD: patch-camel_camel-block-file_h,v 1.2 2010/09/30 07:32:09 ajacoutot Exp $
--- camel/camel-block-file.h.orig Mon Sep 13 14:16:52 2010
+++ camel/camel-block-file.h Mon Sep 27 19:11:45 2010
@@ -25,6 +25,7 @@
#ifndef CAMEL_BLOCK_FILE_H
#define CAMEL_BLOCK_FILE_H
+#include <sys/types.h>
#include <camel/camel-object.h>
#include <camel/camel-list-utils.h>
#include <stdio.h>

10
databases/evolution-data-server/patches/patch-camel_camel-lock_c
View File

@ -1,12 +1,12 @@
$OpenBSD: patch-camel_camel-lock_c,v 1.3 2011/07/03 17:14:24 ajacoutot Exp $
--- camel/camel-lock.c.orig Tue Sep 28 07:46:38 2010
+++ camel/camel-lock.c Tue Sep 28 07:46:50 2010
$OpenBSD: patch-camel_camel-lock_c,v 1.4 2011/09/12 07:26:19 ajacoutot Exp $
--- camel/camel-lock.c.orig Thu Sep 16 14:47:54 2010
+++ camel/camel-lock.c Tue May 17 13:40:32 2011
@@ -128,7 +128,7 @@ camel_lock_dot (const gchar *path,
/* check for stale lock, kill it */
if (g_stat(lock, &st) == 0) {
if (g_stat (lock, &st) == 0) {
time_t now = time (NULL);
- (printf("There is an existing lock %ld seconds old\n", now-st.st_ctime));
+ (printf("There is an existing lock %ld seconds old\n", (long int)now-st.st_ctime));
if (st.st_ctime < now - CAMEL_LOCK_DOT_STALE) {
d(printf("Removing it now\n"));
unlink(lock);
unlink (lock);

24
databases/evolution-data-server/patches/patch-camel_camel-search-sql-sexp_c
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-camel_camel-search-sql-sexp_c,v 1.2 2011/03/29 11:20:02 ajacoutot Exp $
--- camel/camel-search-sql-sexp.c.orig Mon Sep 13 14:16:52 2010
+++ camel/camel-search-sql-sexp.c Tue Mar 29 12:29:11 2011
@@ -176,7 +176,7 @@ eval_eq(struct _ESExp *f, gint argc, struct _ESExpTerm
$OpenBSD: patch-camel_camel-search-sql-sexp_c,v 1.3 2011/09/12 07:26:19 ajacoutot Exp $
--- camel/camel-search-sql-sexp.c.orig Thu Sep 16 14:47:54 2010
+++ camel/camel-search-sql-sexp.c Tue May 17 13:40:32 2011
@@ -176,7 +176,7 @@ eval_eq (struct _ESExp *f, gint argc, struct _ESExpTer
if (r1->type == ESEXP_RES_INT)
g_string_append_printf(str, "%d", r1->value.number);
else if (r1->type == ESEXP_RES_TIME)
@ -10,7 +10,7 @@ $OpenBSD: patch-camel_camel-search-sql-sexp_c,v 1.2 2011/03/29 11:20:02 ajacouto
else if (r1->type == ESEXP_RES_STRING)
g_string_append_printf(str, "%s", r1->value.string);
@@ -194,7 +194,7 @@ eval_eq(struct _ESExp *f, gint argc, struct _ESExpTerm
@@ -194,7 +194,7 @@ eval_eq (struct _ESExp *f, gint argc, struct _ESExpTer
if (r2->type == ESEXP_RES_BOOL)
g_string_append_printf(str, "%d", r2->value.boolean);
else if (r2->type == ESEXP_RES_TIME)
@ -18,8 +18,8 @@ $OpenBSD: patch-camel_camel-search-sql-sexp_c,v 1.2 2011/03/29 11:20:02 ajacouto
+ g_string_append_printf(str, "%lld", (long long)r2->value.time);
else if (r2->type == ESEXP_RES_STRING) {
gchar *tmp = g_strdup_printf("%c%s%c", ut ? '%':' ', r2->value.string, ut?'%':' ');
gchar *safe = get_db_safe_string(tmp);
@@ -229,7 +229,7 @@ eval_lt(struct _ESExp *f, gint argc, struct _ESExpTerm
gchar *safe = get_db_safe_string (tmp);
@@ -229,7 +229,7 @@ eval_lt (struct _ESExp *f, gint argc, struct _ESExpTer
if (r1->type == ESEXP_RES_INT)
g_string_append_printf(str, "%d", r1->value.number);
else if (r1->type == ESEXP_RES_TIME)
@ -28,7 +28,7 @@ $OpenBSD: patch-camel_camel-search-sql-sexp_c,v 1.2 2011/03/29 11:20:02 ajacouto
else if (r1->type == ESEXP_RES_STRING)
g_string_append_printf(str, "%s", r1->value.string);
@@ -239,7 +239,7 @@ eval_lt(struct _ESExp *f, gint argc, struct _ESExpTerm
@@ -239,7 +239,7 @@ eval_lt (struct _ESExp *f, gint argc, struct _ESExpTer
if (r2->type == ESEXP_RES_BOOL)
g_string_append_printf(str, "%d", r2->value.boolean);
else if (r2->type == ESEXP_RES_TIME)
@ -36,8 +36,8 @@ $OpenBSD: patch-camel_camel-search-sql-sexp_c,v 1.2 2011/03/29 11:20:02 ajacouto
+ g_string_append_printf(str, "%lld", (long long)r2->value.time);
else if (r2->type == ESEXP_RES_STRING)
g_string_append_printf(str, "%s", r2->value.string);
e_sexp_result_free(f, r1);
@@ -268,7 +268,7 @@ eval_gt(struct _ESExp *f, gint argc, struct _ESExpTerm
e_sexp_result_free (f, r1);
@@ -268,7 +268,7 @@ eval_gt (struct _ESExp *f, gint argc, struct _ESExpTer
if (r1->type == ESEXP_RES_INT)
g_string_append_printf(str, "%d", r1->value.number);
else if (r1->type == ESEXP_RES_TIME)
@ -46,7 +46,7 @@ $OpenBSD: patch-camel_camel-search-sql-sexp_c,v 1.2 2011/03/29 11:20:02 ajacouto
else if (r1->type == ESEXP_RES_STRING)
g_string_append_printf(str, "%s", r1->value.string);
@@ -278,7 +278,7 @@ eval_gt(struct _ESExp *f, gint argc, struct _ESExpTerm
@@ -278,7 +278,7 @@ eval_gt (struct _ESExp *f, gint argc, struct _ESExpTer
if (r2->type == ESEXP_RES_BOOL)
g_string_append_printf(str, "%d", r2->value.boolean);
else if (r2->type == ESEXP_RES_TIME)
@ -54,4 +54,4 @@ $OpenBSD: patch-camel_camel-search-sql-sexp_c,v 1.2 2011/03/29 11:20:02 ajacouto
+ g_string_append_printf(str, "%lld", (long long)r2->value.time);
else if (r2->type == ESEXP_RES_STRING)
g_string_append_printf(str, "%s", r2->value.string);
e_sexp_result_free(f, r1);
e_sexp_result_free (f, r1);

14
databases/evolution-data-server/patches/patch-camel_providers_local_camel-maildir-summary_c
View File

@ -1,12 +1,12 @@
$OpenBSD: patch-camel_providers_local_camel-maildir-summary_c,v 1.3 2011/04/22 05:55:37 ajacoutot Exp $
--- camel/providers/local/camel-maildir-summary.c.orig Thu Apr 21 21:35:37 2011
+++ camel/providers/local/camel-maildir-summary.c Fri Apr 22 07:28:31 2011
@@ -379,7 +379,7 @@ static gchar *maildir_summary_next_uid_string(CamelFol
g_free(uid);
g_usleep(2*G_USEC_PER_SEC);
$OpenBSD: patch-camel_providers_local_camel-maildir-summary_c,v 1.4 2011/09/12 07:26:19 ajacoutot Exp $
--- camel/providers/local/camel-maildir-summary.c.orig Thu Mar 10 10:50:18 2011
+++ camel/providers/local/camel-maildir-summary.c Tue May 17 13:40:32 2011
@@ -376,7 +376,7 @@ static gchar *maildir_summary_next_uid_string (CamelFo
g_free (uid);
g_usleep (2*G_USEC_PER_SEC);
}
- uid = g_strdup_printf("%ld.%d_%u.%s", time(NULL), getpid(), nextuid, mds->priv->hostname);
+ uid = g_strdup_printf("%lld.%d_%u.%s", (long long)time(NULL), getpid(), nextuid, mds->priv->hostname);
name = g_strdup_printf("%s/tmp/%s", cls->folder_path, uid);
retry++;
} while (g_stat(name, &st) == 0 && retry<3);
} while (g_stat (name, &st) == 0 && retry<3);

86
databases/evolution-data-server/patches/patch-configure_ac
View File

@ -1,64 +1,56 @@
$OpenBSD: patch-configure_ac,v 1.7 2011/04/16 05:51:52 ajacoutot Exp $
$OpenBSD: patch-configure_ac,v 1.8 2011/09/12 07:26:19 ajacoutot Exp $
XXX remove -DGTK_DISABLE_DEPRECATED to fix build with gtk>=2.24
From 27e8a5713a345fc276deb74daa26e982bd87dec7 Mon Sep 17 00:00:00 2001
From: Antoine Jacoutot <ajacoutot@openbsd.org>
Date: Tue, 12 Jul 2011 11:26:39 +0000
Subject: Move the "$host" down when $host is actually set and don't set DL_LIB
Bump libgdata dependency to 0.7.0
The minimum dependency in GNOME is now 0.8.0, so we can bump the e-d-s
dependency to 0.7.0 and remove the various #ifdefs. See: bgo#566441
From upstream git: 69b8607f2dd6d399306905e011a6565319190066
--- configure.ac.orig Mon Dec 27 14:19:33 2010
+++ configure.ac Fri Apr 15 16:06:57 2011
@@ -36,7 +36,7 @@ m4_define([glib_minimum_version], [2.25.12])
m4_define([gconf_minimum_version], [2.0.0]) dnl XXX Just a Guess
m4_define([libxml_minimum_version], [2.0.0]) dnl XXX Just a Guess
m4_define([libsoup_minimum_version], [2.3.0])
-m4_define([libgdata_minimum_version], [0.6.3])
+m4_define([libgdata_minimum_version], [0.7.0])
m4_define([gnome_keyring_minimum_version], [2.20.1])
m4_define([sqlite_minimum_version], [3.5])
m4_define([libical_minimum_version], [0.43])
@@ -167,7 +167,6 @@ AS_COMPILER_FLAGS(WARNING_FLAGS,
"-DG_DISABLE_DEPRECATED
-DPANGO_DISABLE_DEPRECATED
-DGDK_PIXBUF_DISABLE_DEPRECATED
- -DGTK_DISABLE_DEPRECATED
-DG_DISABLE_SINGLE_INCLUDES
-DGTK_DISABLE_SINGLE_INCLUDES
-DGSEAL_ENABLE
@@ -199,8 +198,6 @@ dnl -Wstrict-aliasing=2
AM_CPPFLAGS="$WARNING_FLAGS -fno-strict-aliasing"
--- configure.ac.orig Mon May 23 17:06:26 2011
+++ configure.ac Wed Jul 13 04:17:16 2011
@@ -185,15 +185,6 @@ AM_CPPFLAGS="$WARNING_FLAGS -fno-strict-aliasing"
AC_SUBST(AM_CPPFLAGS)
-LDFLAGS="$LDFLAGS -Wl,--no-undefined"
-case "$host" in
-*openbsd*|*freebsd*)
- dnl Do not set '-Wl,--no-undefined' on freebsd/openbsd
- ;;
-*)
- LDFLAGS="$LDFLAGS -Wl,--no-undefined"
- ;;
-esac
-
dnl ******************************
dnl Initialize maintainer mode
dnl ******************************
@@ -285,6 +282,13 @@ case "$host" in
@@ -265,6 +256,16 @@ dnl Gtk Doc stuff
dnl ******************************
GTK_DOC_CHECK(1.9)
+dnl This must appear after AC_CANONICAL_HOST, which defines $host.
+case "$host" in
+*openbsd*|*freebsd*)
+ dnl Do not set '-Wl,--no-undefined' on freebsd/openbsd
+ ;;
+*)
+ LDFLAGS="$LDFLAGS -Wl,--no-undefined"
+;;
+esac
+
dnl ******************************
dnl Check for Win32
dnl ******************************
@@ -278,6 +279,13 @@ case "$host" in
LIBEXECDIR_IN_SERVER_FILE='../../../libexec'
AC_CACHE_VAL(ac_cv_have_addrinfo, [ac_cv_have_addrinfo=yes])
AC_DEFINE(_WIN32_WINNT, 0x501, [To get getaddrinfo etc declarations])
;;
+*openbsd*)
+ ;;
+*openbsd*|*freebsd*)
+ os_win32='no'
+ NO_UNDEFINED=''
+ SOCKET_LIBS=''
+ DL_LIB=''
+ LIBEXECDIR_IN_SERVER_FILE="$libexecdir"
+ ;;
;;
*)
os_win32='no'
NO_UNDEFINED=''
@@ -324,12 +328,6 @@ PKG_CHECK_MODULES(GNOME_PLATFORM,
libxml-2.0 >= libxml_minimum_version
libsoup-2.4 >= libsoup_minimum_version
libgdata >= libgdata_minimum_version])
-
-dnl libgdata 0.7 will break API. We're not going to deal with
-dnl that on a stable branch, so cap the supported version.
-if $PKG_CONFIG --atleast-version=0.7 libgdata; then
- AC_MSG_ERROR([libgdata 0.7 is not supported, use 0.6 instead])
-fi
LIBICAL_REQUIRED=libical_minimum_version
AC_SUBST(LIBICAL_REQUIRED)

6
databases/evolution-data-server/patches/patch-m4_evo_krb5_support_m4
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-m4_evo_krb5_support_m4,v 1.1 2010/04/22 09:17:50 ajacoutot Exp $
--- m4/evo_krb5_support.m4.orig Wed Apr 21 10:25:20 2010
+++ m4/evo_krb5_support.m4 Wed Apr 21 10:25:33 2010
$OpenBSD: patch-m4_evo_krb5_support_m4,v 1.2 2011/09/12 07:26:19 ajacoutot Exp $
--- m4/evo_krb5_support.m4.orig Tue Jul 12 10:36:17 2011
+++ m4/evo_krb5_support.m4 Tue Jul 12 10:36:30 2011
@@ -27,7 +27,7 @@ AC_DEFUN([EVO_KRB5_SUPPORT],[
LIBS_save="$LIBS"

11
databases/evolution-data-server/pkg/DESCR
View File

@ -1,3 +1,8 @@
Evolution-data-server makes up the various backend components for the
Evolution integrated mail/PIM suite. This includes the backend Berkeley
database as well as the libical calendar components.
The Evolution Data Server package provides a unified backend for
programs that work with contacts, tasks, and calendar information. It
was originally developed for Evolution (hence the name), but is now used
by other packages as well.
The Evolution Data Server provides a single database for common,
desktop-wide information, such as a user's address book or calendar
events.

196
databases/evolution-data-server/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.22 2010/09/30 07:32:09 ajacoutot Exp $
@comment $OpenBSD: PLIST,v 1.23 2011/09/12 07:26:19 ajacoutot Exp $
include/evolution-data-server-${R}/
include/evolution-data-server-${R}/camel/
include/evolution-data-server-${R}/camel/camel-address.h
@ -83,8 +83,6 @@ include/evolution-data-server-${R}/camel/camel-sasl.h
include/evolution-data-server-${R}/camel/camel-search-private.h
include/evolution-data-server-${R}/camel/camel-search-sql-sexp.h
include/evolution-data-server-${R}/camel/camel-search-sql.h
include/evolution-data-server-${R}/camel/camel-seekable-stream.h
include/evolution-data-server-${R}/camel/camel-seekable-substream.h
include/evolution-data-server-${R}/camel/camel-service.h
include/evolution-data-server-${R}/camel/camel-session.h
include/evolution-data-server-${R}/camel/camel-smime-context.h
@ -217,77 +215,81 @@ include/evolution-data-server-${R}/libedataserverui/e-source-combo-box.h
include/evolution-data-server-${R}/libedataserverui/e-source-selector-dialog.h
include/evolution-data-server-${R}/libedataserverui/e-source-selector.h
include/evolution-data-server-${R}/libedataserverui/e-tree-model-generator.h
lib/evolution-data-server-1.2/
lib/evolution-data-server-1.2/camel-providers/
@comment lib/evolution-data-server-1.2/camel-providers/libcamelgroupwise.a
@comment lib/evolution-data-server-1.2/camel-providers/libcamelgroupwise.la
lib/evolution-data-server-1.2/camel-providers/libcamelgroupwise.so
lib/evolution-data-server-1.2/camel-providers/libcamelgroupwise.urls
@comment lib/evolution-data-server-1.2/camel-providers/libcamelimap.a
@comment lib/evolution-data-server-1.2/camel-providers/libcamelimap.la
lib/evolution-data-server-1.2/camel-providers/libcamelimap.so
lib/evolution-data-server-1.2/camel-providers/libcamelimap.urls
@comment lib/evolution-data-server-1.2/camel-providers/libcamelimapx.a
@comment lib/evolution-data-server-1.2/camel-providers/libcamelimapx.la
lib/evolution-data-server-1.2/camel-providers/libcamelimapx.so
lib/evolution-data-server-1.2/camel-providers/libcamelimapx.urls
@comment lib/evolution-data-server-1.2/camel-providers/libcamellocal.a
@comment lib/evolution-data-server-1.2/camel-providers/libcamellocal.la
lib/evolution-data-server-1.2/camel-providers/libcamellocal.so
lib/evolution-data-server-1.2/camel-providers/libcamellocal.urls
@comment lib/evolution-data-server-1.2/camel-providers/libcamelnntp.a
@comment lib/evolution-data-server-1.2/camel-providers/libcamelnntp.la
lib/evolution-data-server-1.2/camel-providers/libcamelnntp.so
lib/evolution-data-server-1.2/camel-providers/libcamelnntp.urls
@comment lib/evolution-data-server-1.2/camel-providers/libcamelpop3.a
@comment lib/evolution-data-server-1.2/camel-providers/libcamelpop3.la
lib/evolution-data-server-1.2/camel-providers/libcamelpop3.so
lib/evolution-data-server-1.2/camel-providers/libcamelpop3.urls
@comment lib/evolution-data-server-1.2/camel-providers/libcamelsendmail.a
@comment lib/evolution-data-server-1.2/camel-providers/libcamelsendmail.la
lib/evolution-data-server-1.2/camel-providers/libcamelsendmail.so
lib/evolution-data-server-1.2/camel-providers/libcamelsendmail.urls
@comment lib/evolution-data-server-1.2/camel-providers/libcamelsmtp.a
@comment lib/evolution-data-server-1.2/camel-providers/libcamelsmtp.la
lib/evolution-data-server-1.2/camel-providers/libcamelsmtp.so
lib/evolution-data-server-1.2/camel-providers/libcamelsmtp.urls
lib/evolution-data-server-1.2/extensions/
@comment lib/evolution-data-server-1.2/extensions/libebookbackendfile.a
@comment lib/evolution-data-server-1.2/extensions/libebookbackendfile.la
lib/evolution-data-server-1.2/extensions/libebookbackendfile.so
@comment lib/evolution-data-server-1.2/extensions/libebookbackendgoogle.a
@comment lib/evolution-data-server-1.2/extensions/libebookbackendgoogle.la
lib/evolution-data-server-1.2/extensions/libebookbackendgoogle.so
@comment lib/evolution-data-server-1.2/extensions/libebookbackendgroupwise.a
@comment lib/evolution-data-server-1.2/extensions/libebookbackendgroupwise.la
lib/evolution-data-server-1.2/extensions/libebookbackendgroupwise.so
@comment lib/evolution-data-server-1.2/extensions/libebookbackendldap.a
@comment lib/evolution-data-server-1.2/extensions/libebookbackendldap.la
lib/evolution-data-server-1.2/extensions/libebookbackendldap.so
@comment lib/evolution-data-server-1.2/extensions/libebookbackendvcf.a
@comment lib/evolution-data-server-1.2/extensions/libebookbackendvcf.la
lib/evolution-data-server-1.2/extensions/libebookbackendvcf.so
@comment lib/evolution-data-server-1.2/extensions/libebookbackendwebdav.a
@comment lib/evolution-data-server-1.2/extensions/libebookbackendwebdav.la
lib/evolution-data-server-1.2/extensions/libebookbackendwebdav.so
@comment lib/evolution-data-server-1.2/extensions/libecalbackendcaldav.a
@comment lib/evolution-data-server-1.2/extensions/libecalbackendcaldav.la
lib/evolution-data-server-1.2/extensions/libecalbackendcaldav.so
@comment lib/evolution-data-server-1.2/extensions/libecalbackendcontacts.a
@comment lib/evolution-data-server-1.2/extensions/libecalbackendcontacts.la
lib/evolution-data-server-1.2/extensions/libecalbackendcontacts.so
@comment lib/evolution-data-server-1.2/extensions/libecalbackendfile.a
@comment lib/evolution-data-server-1.2/extensions/libecalbackendfile.la
lib/evolution-data-server-1.2/extensions/libecalbackendfile.so
@comment lib/evolution-data-server-1.2/extensions/libecalbackendgroupwise.a
@comment lib/evolution-data-server-1.2/extensions/libecalbackendgroupwise.la
lib/evolution-data-server-1.2/extensions/libecalbackendgroupwise.so
@comment lib/evolution-data-server-1.2/extensions/libecalbackendhttp.a
@comment lib/evolution-data-server-1.2/extensions/libecalbackendhttp.la
lib/evolution-data-server-1.2/extensions/libecalbackendhttp.so
@comment lib/evolution-data-server-1.2/extensions/libecalbackendweather.a
@comment lib/evolution-data-server-1.2/extensions/libecalbackendweather.la
lib/evolution-data-server-1.2/extensions/libecalbackendweather.so
lib/evolution-data-server/
lib/evolution-data-server/addressbook-backends/
@comment lib/evolution-data-server/addressbook-backends/libebookbackendfile.a
@comment lib/evolution-data-server/addressbook-backends/libebookbackendfile.la
lib/evolution-data-server/addressbook-backends/libebookbackendfile.so
@comment lib/evolution-data-server/addressbook-backends/libebookbackendgoogle.a
@comment lib/evolution-data-server/addressbook-backends/libebookbackendgoogle.la
lib/evolution-data-server/addressbook-backends/libebookbackendgoogle.so
@comment lib/evolution-data-server/addressbook-backends/libebookbackendgroupwise.a
@comment lib/evolution-data-server/addressbook-backends/libebookbackendgroupwise.la
lib/evolution-data-server/addressbook-backends/libebookbackendgroupwise.so
@comment lib/evolution-data-server/addressbook-backends/libebookbackendldap.a
@comment lib/evolution-data-server/addressbook-backends/libebookbackendldap.la
lib/evolution-data-server/addressbook-backends/libebookbackendldap.so
@comment lib/evolution-data-server/addressbook-backends/libebookbackendvcf.a
@comment lib/evolution-data-server/addressbook-backends/libebookbackendvcf.la
lib/evolution-data-server/addressbook-backends/libebookbackendvcf.so
@comment lib/evolution-data-server/addressbook-backends/libebookbackendwebdav.a
@comment lib/evolution-data-server/addressbook-backends/libebookbackendwebdav.la
lib/evolution-data-server/addressbook-backends/libebookbackendwebdav.so
lib/evolution-data-server/calendar-backends/
@comment lib/evolution-data-server/calendar-backends/libecalbackendcaldav.a
@comment lib/evolution-data-server/calendar-backends/libecalbackendcaldav.la
lib/evolution-data-server/calendar-backends/libecalbackendcaldav.so
@comment lib/evolution-data-server/calendar-backends/libecalbackendcontacts.a
@comment lib/evolution-data-server/calendar-backends/libecalbackendcontacts.la
lib/evolution-data-server/calendar-backends/libecalbackendcontacts.so
@comment lib/evolution-data-server/calendar-backends/libecalbackendfile.a
@comment lib/evolution-data-server/calendar-backends/libecalbackendfile.la
lib/evolution-data-server/calendar-backends/libecalbackendfile.so
@comment lib/evolution-data-server/calendar-backends/libecalbackendgroupwise.a
@comment lib/evolution-data-server/calendar-backends/libecalbackendgroupwise.la
lib/evolution-data-server/calendar-backends/libecalbackendgroupwise.so
@comment lib/evolution-data-server/calendar-backends/libecalbackendhttp.a
@comment lib/evolution-data-server/calendar-backends/libecalbackendhttp.la
lib/evolution-data-server/calendar-backends/libecalbackendhttp.so
@comment lib/evolution-data-server/calendar-backends/libecalbackendweather.a
@comment lib/evolution-data-server/calendar-backends/libecalbackendweather.la
lib/evolution-data-server/calendar-backends/libecalbackendweather.so
lib/evolution-data-server/camel-providers/
@comment lib/evolution-data-server/camel-providers/libcamelgroupwise.a
@comment lib/evolution-data-server/camel-providers/libcamelgroupwise.la
lib/evolution-data-server/camel-providers/libcamelgroupwise.so
lib/evolution-data-server/camel-providers/libcamelgroupwise.urls
@comment lib/evolution-data-server/camel-providers/libcamelimap.a
@comment lib/evolution-data-server/camel-providers/libcamelimap.la
lib/evolution-data-server/camel-providers/libcamelimap.so
lib/evolution-data-server/camel-providers/libcamelimap.urls
@comment lib/evolution-data-server/camel-providers/libcamelimapx.a
@comment lib/evolution-data-server/camel-providers/libcamelimapx.la
lib/evolution-data-server/camel-providers/libcamelimapx.so
lib/evolution-data-server/camel-providers/libcamelimapx.urls
@comment lib/evolution-data-server/camel-providers/libcamellocal.a
@comment lib/evolution-data-server/camel-providers/libcamellocal.la
lib/evolution-data-server/camel-providers/libcamellocal.so
lib/evolution-data-server/camel-providers/libcamellocal.urls
@comment lib/evolution-data-server/camel-providers/libcamelnntp.a
@comment lib/evolution-data-server/camel-providers/libcamelnntp.la
lib/evolution-data-server/camel-providers/libcamelnntp.so
lib/evolution-data-server/camel-providers/libcamelnntp.urls
@comment lib/evolution-data-server/camel-providers/libcamelpop3.a
@comment lib/evolution-data-server/camel-providers/libcamelpop3.la
lib/evolution-data-server/camel-providers/libcamelpop3.so
lib/evolution-data-server/camel-providers/libcamelpop3.urls
@comment lib/evolution-data-server/camel-providers/libcamelsendmail.a
@comment lib/evolution-data-server/camel-providers/libcamelsendmail.la
lib/evolution-data-server/camel-providers/libcamelsendmail.so
lib/evolution-data-server/camel-providers/libcamelsendmail.urls
@comment lib/evolution-data-server/camel-providers/libcamelsmtp.a
@comment lib/evolution-data-server/camel-providers/libcamelsmtp.la
lib/evolution-data-server/camel-providers/libcamelsmtp.so
lib/evolution-data-server/camel-providers/libcamelsmtp.urls
lib/girepository-1.0/EBook-1.2.typelib
lib/girepository-1.0/ECalendar-1.2.typelib
lib/girepository-1.0/EDataServer-1.2.typelib
lib/libcamel-1.2.a
lib/libcamel-1.2.la
@lib lib/libcamel-1.2.so.${LIBcamel-1.2_VERSION}
@ -312,9 +314,9 @@ lib/libedata-cal-1.2.la
lib/libedataserver-1.2.a
lib/libedataserver-1.2.la
@lib lib/libedataserver-1.2.so.${LIBedataserver-1.2_VERSION}
lib/libedataserverui-1.2.a
lib/libedataserverui-1.2.la
@lib lib/libedataserverui-1.2.so.${LIBedataserverui-1.2_VERSION}
lib/libedataserverui-${R}.a
lib/libedataserverui-${R}.la
@lib lib/libedataserverui-${R}.so.${LIBedataserverui-3.0_VERSION}
lib/libegroupwise-1.2.a
lib/libegroupwise-1.2.la
@lib lib/libegroupwise-1.2.so.${LIBegroupwise-1.2_VERSION}
@ -327,7 +329,7 @@ lib/pkgconfig/libecal-1.2.pc
lib/pkgconfig/libedata-book-1.2.pc
lib/pkgconfig/libedata-cal-1.2.pc
lib/pkgconfig/libedataserver-1.2.pc
lib/pkgconfig/libedataserverui-1.2.pc
lib/pkgconfig/libedataserverui-${R}.pc
lib/pkgconfig/libegroupwise-1.2.pc
@bin libexec/camel-index-control-1.2
@mode 4555
@ -339,11 +341,9 @@ share/dbus-1/services/org.gnome.evolution.dataserver.AddressBook.service
share/dbus-1/services/org.gnome.evolution.dataserver.Calendar.service
share/evolution-data-server-${R}/
share/evolution-data-server-${R}/evolutionperson.schema
share/evolution-data-server-${R}/ui/
share/evolution-data-server-${R}/ui/e-categories-dialog.ui
share/evolution-data-server-${R}/ui/e-name-selector-dialog.ui
share/evolution-data-server-${R}/weather/
share/evolution-data-server-${R}/weather/Locations.xml
share/gir-1.0/EBook-1.2.gir
share/gir-1.0/ECalendar-1.2.gir
share/gir-1.0/EDataServer-1.2.gir
share/gtk-doc/html/camel/
share/gtk-doc/html/camel/Addresses.html
share/gtk-doc/html/camel/CamelAddress.html
@ -404,8 +404,6 @@ share/gtk-doc/html/camel/CamelSaslLogin.html
share/gtk-doc/html/camel/CamelSaslNTLM.html
share/gtk-doc/html/camel/CamelSaslPOPB4SMTP.html
share/gtk-doc/html/camel/CamelSaslPlain.html
share/gtk-doc/html/camel/CamelSeekableStream.html
share/gtk-doc/html/camel/CamelSeekableSubstream.html
share/gtk-doc/html/camel/CamelService.html
share/gtk-doc/html/camel/CamelSession.html
share/gtk-doc/html/camel/CamelStore.html
@ -444,6 +442,7 @@ share/gtk-doc/html/camel/api-index-2.24.html
share/gtk-doc/html/camel/api-index-2.26.html
share/gtk-doc/html/camel/api-index-2.28.html
share/gtk-doc/html/camel/api-index-2.30.html
share/gtk-doc/html/camel/api-index-2.32.html
share/gtk-doc/html/camel/api-index-${R}.html
share/gtk-doc/html/camel/api-index-deprecated.html
share/gtk-doc/html/camel/api-index-full.html
@ -475,7 +474,6 @@ share/gtk-doc/html/camel/camel-camel-url-scanner.html
share/gtk-doc/html/camel/camel-camel-url.html
share/gtk-doc/html/camel/camel-camel-utf8.html
share/gtk-doc/html/camel/camel-camel.html
share/gtk-doc/html/camel/camel.devhelp
share/gtk-doc/html/camel/camel.devhelp2
share/gtk-doc/html/camel/classes.html
share/gtk-doc/html/camel/home.png
@ -486,6 +484,8 @@ share/gtk-doc/html/camel/right.png
share/gtk-doc/html/camel/style.css
share/gtk-doc/html/camel/up.png
share/gtk-doc/html/libebackend/
share/gtk-doc/html/libebackend/EFileCache.html
share/gtk-doc/html/libebackend/EOfflineListener.html
share/gtk-doc/html/libebackend/api-index-2.24.html
share/gtk-doc/html/libebackend/api-index-2.26.html
share/gtk-doc/html/libebackend/api-index-2.28.html
@ -497,12 +497,9 @@ share/gtk-doc/html/libebackend/index.html
share/gtk-doc/html/libebackend/index.sgml
share/gtk-doc/html/libebackend/ix01.html
share/gtk-doc/html/libebackend/left.png
share/gtk-doc/html/libebackend/libebackend-EOfflineListener.html
share/gtk-doc/html/libebackend/libebackend-e-data-server-module.html
share/gtk-doc/html/libebackend/libebackend-e-db3-utils.html
share/gtk-doc/html/libebackend/libebackend-e-dbhash.html
share/gtk-doc/html/libebackend/libebackend-e-file-cache.html
share/gtk-doc/html/libebackend/libebackend.devhelp
share/gtk-doc/html/libebackend/libebackend.devhelp2
share/gtk-doc/html/libebackend/right.png
share/gtk-doc/html/libebackend/style.css
@ -513,12 +510,14 @@ share/gtk-doc/html/libebook/EBookView.html
share/gtk-doc/html/libebook/EContact.html
share/gtk-doc/html/libebook/EDestination.html
share/gtk-doc/html/libebook/EVCard.html
share/gtk-doc/html/libebook/annotation-glossary.html
share/gtk-doc/html/libebook/api-index-1.12.html
share/gtk-doc/html/libebook/api-index-2.22.html
share/gtk-doc/html/libebook/api-index-2.24.html
share/gtk-doc/html/libebook/api-index-2.26.html
share/gtk-doc/html/libebook/api-index-2.28.html
share/gtk-doc/html/libebook/api-index-2.30.html
share/gtk-doc/html/libebook/api-index-2.32.html
share/gtk-doc/html/libebook/api-index-${R}.html
share/gtk-doc/html/libebook/api-index-deprecated.html
share/gtk-doc/html/libebook/api-index-full.html
@ -531,7 +530,6 @@ share/gtk-doc/html/libebook/libebook-EAddressWestern.html
share/gtk-doc/html/libebook/libebook-ENameWestern.html
share/gtk-doc/html/libebook/libebook-e-book-query.html
share/gtk-doc/html/libebook/libebook-e-book-types.html
share/gtk-doc/html/libebook/libebook.devhelp
share/gtk-doc/html/libebook/libebook.devhelp2
share/gtk-doc/html/libebook/right.png
share/gtk-doc/html/libebook/style.css
@ -540,12 +538,14 @@ share/gtk-doc/html/libecal/
share/gtk-doc/html/libecal/ECal.html
share/gtk-doc/html/libecal/ECalComponent.html
share/gtk-doc/html/libecal/ECalView.html
share/gtk-doc/html/libecal/annotation-glossary.html
share/gtk-doc/html/libecal/api-index-1.12.html
share/gtk-doc/html/libecal/api-index-2.22.html
share/gtk-doc/html/libecal/api-index-2.24.html
share/gtk-doc/html/libecal/api-index-2.26.html
share/gtk-doc/html/libecal/api-index-2.28.html
share/gtk-doc/html/libecal/api-index-2.30.html
share/gtk-doc/html/libecal/api-index-2.32.html
share/gtk-doc/html/libecal/api-index-${R}.html
share/gtk-doc/html/libecal/api-index-deprecated.html
share/gtk-doc/html/libecal/api-index-full.html
@ -560,7 +560,6 @@ share/gtk-doc/html/libecal/libecal-e-cal-system-timezone.html
share/gtk-doc/html/libecal/libecal-e-cal-time-util.html
share/gtk-doc/html/libecal/libecal-e-cal-types.html
share/gtk-doc/html/libecal/libecal-e-cal-util.html
share/gtk-doc/html/libecal/libecal.devhelp
share/gtk-doc/html/libecal/libecal.devhelp2
share/gtk-doc/html/libecal/right.png
share/gtk-doc/html/libecal/style.css
@ -580,6 +579,7 @@ share/gtk-doc/html/libedata-book/api-index-2.24.html
share/gtk-doc/html/libedata-book/api-index-2.26.html
share/gtk-doc/html/libedata-book/api-index-2.28.html
share/gtk-doc/html/libedata-book/api-index-2.30.html
share/gtk-doc/html/libedata-book/api-index-2.32.html
share/gtk-doc/html/libedata-book/api-index-${R}.html
share/gtk-doc/html/libedata-book/api-index-deprecated.html
share/gtk-doc/html/libedata-book/api-index-full.html
@ -591,7 +591,6 @@ share/gtk-doc/html/libedata-book/left.png
share/gtk-doc/html/libedata-book/libedata-book-EDataBookFactory.html
share/gtk-doc/html/libedata-book/libedata-book-e-book-backend-db-cache.html
share/gtk-doc/html/libedata-book/libedata-book-ximian-vcard.html
share/gtk-doc/html/libedata-book/libedata-book.devhelp
share/gtk-doc/html/libedata-book/libedata-book.devhelp2
share/gtk-doc/html/libedata-book/right.png
share/gtk-doc/html/libedata-book/style.css
@ -609,6 +608,7 @@ share/gtk-doc/html/libedata-cal/api-index-2.24.html
share/gtk-doc/html/libedata-cal/api-index-2.26.html
share/gtk-doc/html/libedata-cal/api-index-2.28.html
share/gtk-doc/html/libedata-cal/api-index-2.30.html
share/gtk-doc/html/libedata-cal/api-index-2.32.html
share/gtk-doc/html/libedata-cal/api-index-${R}.html
share/gtk-doc/html/libedata-cal/api-index-deprecated.html
share/gtk-doc/html/libedata-cal/api-index-full.html
@ -624,7 +624,6 @@ share/gtk-doc/html/libedata-cal/libedata-cal-EDataCalFactory.html
share/gtk-doc/html/libedata-cal/libedata-cal-EDataCalView.html
share/gtk-doc/html/libedata-cal/libedata-cal-EIntervalTree.html
share/gtk-doc/html/libedata-cal/libedata-cal-e-cal-backend-util.html
share/gtk-doc/html/libedata-cal/libedata-cal.devhelp
share/gtk-doc/html/libedata-cal/libedata-cal.devhelp2
share/gtk-doc/html/libedata-cal/right.png
share/gtk-doc/html/libedata-cal/style.css
@ -635,15 +634,18 @@ share/gtk-doc/html/libedataserver/EAccountList.html
share/gtk-doc/html/libedataserver/EIterator.html
share/gtk-doc/html/libedataserver/EList.html
share/gtk-doc/html/libedataserver/EListIterator.html
share/gtk-doc/html/libedataserver/EProxy.html
share/gtk-doc/html/libedataserver/ESource.html
share/gtk-doc/html/libedataserver/ESourceGroup.html
share/gtk-doc/html/libedataserver/ESourceList.html
share/gtk-doc/html/libedataserver/annotation-glossary.html
share/gtk-doc/html/libedataserver/api-index-1.12.html
share/gtk-doc/html/libedataserver/api-index-2.22.html
share/gtk-doc/html/libedataserver/api-index-2.24.html
share/gtk-doc/html/libedataserver/api-index-2.26.html
share/gtk-doc/html/libedataserver/api-index-2.28.html
share/gtk-doc/html/libedataserver/api-index-2.30.html
share/gtk-doc/html/libedataserver/api-index-2.32.html
share/gtk-doc/html/libedataserver/api-index-${R}.html
share/gtk-doc/html/libedataserver/api-index-deprecated.html
share/gtk-doc/html/libedataserver/api-index-full.html
@ -653,7 +655,6 @@ share/gtk-doc/html/libedataserver/index.html
share/gtk-doc/html/libedataserver/index.sgml
share/gtk-doc/html/libedataserver/left.png
share/gtk-doc/html/libedataserver/libedataserver-EFlag.html
share/gtk-doc/html/libedataserver/libedataserver-EProxy.html
share/gtk-doc/html/libedataserver/libedataserver-ESExp.html
share/gtk-doc/html/libedataserver/libedataserver-Version-Information.html
share/gtk-doc/html/libedataserver/libedataserver-e-categories.html
@ -664,7 +665,6 @@ share/gtk-doc/html/libedataserver/libedataserver-e-uid.html
share/gtk-doc/html/libedataserver/libedataserver-e-url.html
share/gtk-doc/html/libedataserver/libedataserver-e-util.html
share/gtk-doc/html/libedataserver/libedataserver-e-xml-hash-utils.html
share/gtk-doc/html/libedataserver/libedataserver.devhelp
share/gtk-doc/html/libedataserver/libedataserver.devhelp2
share/gtk-doc/html/libedataserver/right.png
share/gtk-doc/html/libedataserver/style.css
@ -688,6 +688,7 @@ share/gtk-doc/html/libedataserverui/api-index-2.24.html
share/gtk-doc/html/libedataserverui/api-index-2.26.html
share/gtk-doc/html/libedataserverui/api-index-2.28.html
share/gtk-doc/html/libedataserverui/api-index-2.30.html
share/gtk-doc/html/libedataserverui/api-index-2.32.html
share/gtk-doc/html/libedataserverui/api-index-${R}.html
share/gtk-doc/html/libedataserverui/api-index-deprecated.html
share/gtk-doc/html/libedataserverui/api-index-full.html
@ -700,7 +701,6 @@ share/gtk-doc/html/libedataserverui/libedataserverui-ECategoryCompletion.html
share/gtk-doc/html/libedataserverui/libedataserverui-ECellRendererColor.html
share/gtk-doc/html/libedataserverui/libedataserverui-e-book-auth-util.html
share/gtk-doc/html/libedataserverui/libedataserverui-e-passwords.html
share/gtk-doc/html/libedataserverui/libedataserverui.devhelp
share/gtk-doc/html/libedataserverui/libedataserverui.devhelp2
share/gtk-doc/html/libedataserverui/right.png
share/gtk-doc/html/libedataserverui/style.css
@ -729,6 +729,7 @@ share/locale/en_AU/LC_MESSAGES/
share/locale/en_AU/LC_MESSAGES/evolution-data-server-${R}.mo
share/locale/en_CA/LC_MESSAGES/evolution-data-server-${R}.mo
share/locale/en_GB/LC_MESSAGES/evolution-data-server-${R}.mo
share/locale/eo/LC_MESSAGES/evolution-data-server-${R}.mo
share/locale/es/LC_MESSAGES/evolution-data-server-${R}.mo
share/locale/et/LC_MESSAGES/evolution-data-server-${R}.mo
share/locale/eu/LC_MESSAGES/evolution-data-server-${R}.mo
@ -782,6 +783,7 @@ share/locale/ta/LC_MESSAGES/evolution-data-server-${R}.mo
share/locale/te/LC_MESSAGES/evolution-data-server-${R}.mo
share/locale/th/LC_MESSAGES/evolution-data-server-${R}.mo
share/locale/tr/LC_MESSAGES/evolution-data-server-${R}.mo
share/locale/ug/LC_MESSAGES/evolution-data-server-${R}.mo
share/locale/uk/LC_MESSAGES/evolution-data-server-${R}.mo
share/locale/vi/LC_MESSAGES/evolution-data-server-${R}.mo
share/locale/wa/LC_MESSAGES/evolution-data-server-${R}.mo
@ -809,3 +811,5 @@ share/pixmaps/evolution-data-server/category_status_16.png
share/pixmaps/evolution-data-server/category_strategies_16.png
share/pixmaps/evolution-data-server/category_suppliers_16.png
share/pixmaps/evolution-data-server/category_time-and-expenses_16.png
@exec %D/bin/glib-compile-schemas %D/share/glib-2.0/schemas >/dev/null
@unexec-delete %D/bin/glib-compile-schemas %D/share/glib-2.0/schemas >/dev/null

29
devel/gconf-editor/Makefile
View File

@ -1,10 +1,11 @@
# $OpenBSD: Makefile,v 1.54 2011/05/30 19:02:24 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.55 2011/09/12 07:26:19 ajacoutot Exp $
COMMENT= editor for the GConf configuration system
GNOME_PROJECT= gconf-editor
GNOME_VERSION= 2.32.0
REVISION= 5
GNOME_VERSION= 3.0.0
REVISION= 0
CATEGORIES= devel x11
@ -19,29 +20,31 @@ PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
WANTLIB += ORBit-2 X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext
WANTLIB += Xfixes Xi Xinerama Xrandr Xrender atk-1.0 c cairo dbus-1
WANTLIB += dbus-glib-1 expat fontconfig freetype gdk-x11-2.0 gdk_pixbuf-2.0
WANTLIB += gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 gthread-2.0
WANTLIB += gtk-x11-2.0 m pango-1.0 pangocairo-1.0 pangoft2-1.0
WANTLIB += pcre pixman-1 png pthread pthread-stubs xcb z
WANTLIB += xcb-render xcb-render-util
WANTLIB += GL ORBit-2 X11 Xau Xcomposite Xcursor Xdamage Xdmcp
WANTLIB += Xext Xfixes Xi Xinerama Xrandr Xrender Xxf86vm atk-1.0
WANTLIB += c cairo cairo-gobject drm expat fontconfig freetype
WANTLIB += gdk-3 gdk_pixbuf-2.0 gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0
WANTLIB += gthread-2.0 gtk-3 m pango-1.0 pangocairo-1.0 pangoft2-1.0
WANTLIB += pcre pixman-1 png pthread pthread-stubs xcb xcb-render
WANTLIB += xcb-shm z
MODULES= devel/gettext \
x11/gnome \
devel/gconf2
LIB_DEPENDS= x11/gtk+2
LIB_DEPENDS= x11/gtk+3
RUN_DEPENDS= devel/gconf2,-polkit
USE_GROFF= Yes
DESKTOP_FILES= Yes
MODGNOME_HELP_FILES= Yes
MODGCONF2_SCHEMAS_DIR= gconf-editor
CONFIGURE_STYLE=gnu
CONFIGURE_ARGS= ${CONFIGURE_SHARED}
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
USE_GROFF = Yes
CONFIGURE_ARGS= ${CONFIGURE_SHARED}
# the devel/gconf2 MODULE overrides the path to gconftool-2
CONFIGURE_ARGS += --with-gconf-defaults-source="xml:merged:/var/db/gconf/gconf.xml.defaults" \

10
devel/gconf-editor/distinfo
View File

@ -1,5 +1,5 @@
MD5 (gconf-editor-2.32.0.tar.bz2) = FOQT6IOAsNekY8K+6jusLg==
RMD160 (gconf-editor-2.32.0.tar.bz2) = 7obYSVq02WFiUqdFE81VvbQ7rOY=
SHA1 (gconf-editor-2.32.0.tar.bz2) = YqMe1VE0X6M0AzSoKL0iUC62CRE=
SHA256 (gconf-editor-2.32.0.tar.bz2) = xtHTXOXRNhIa127+HEAzQluyrTgA5xG9G8qc6GnBKh8=
SIZE (gconf-editor-2.32.0.tar.bz2) = 1397117
MD5 (gconf-editor-3.0.0.tar.bz2) = U161mG2DwXqRiR2ib2t48w==
RMD160 (gconf-editor-3.0.0.tar.bz2) = M8InNNkVAEvkvy/f8VhekOaBIrw=
SHA1 (gconf-editor-3.0.0.tar.bz2) = CH8Ht3odwHA0QBSHA1ux9JsiNRs=
SHA256 (gconf-editor-3.0.0.tar.bz2) = GE4XQWwt2SfMs6m0NdhvvktlQxa5Gm23JKP9RHqfrmA=
SIZE (gconf-editor-3.0.0.tar.bz2) = 1478478

3
devel/gconf-editor/pkg/DESCR
View File

@ -1,2 +1 @@
An editor for the GConf configuration system, similar to the registry
editor for that other graphical operating system.
An editor for the GConf configuration system.

3
devel/gconf-editor/pkg/MESSAGE
View File

@ -1,3 +0,0 @@
If you want to be able to set system-wide defaults and/or mandatory
values, you'll need to run gconf-editor as root or install the
gconf2-polkit package and let PolicyKit handle privilege granting.

30
devel/gconf-editor/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.21 2010/09/30 07:32:30 ajacoutot Exp $
@comment $OpenBSD: PLIST,v 1.22 2011/09/12 07:26:19 ajacoutot Exp $
@bin bin/gconf-editor
@man man/man1/gconf-editor.1
share/applications/gconf-editor.desktop
@ -137,6 +137,16 @@ share/gnome/help/gconf-editor/ru/figures/entry-schema.png
share/gnome/help/gconf-editor/ru/figures/entry-string.png
share/gnome/help/gconf-editor/ru/figures/gconf_editor_anno_window.png
share/gnome/help/gconf-editor/ru/gconf-editor.xml
share/gnome/help/gconf-editor/sl/
share/gnome/help/gconf-editor/sl/figures/
share/gnome/help/gconf-editor/sl/figures/entry-blank.png
share/gnome/help/gconf-editor/sl/figures/entry-bool.png
share/gnome/help/gconf-editor/sl/figures/entry-list.png
share/gnome/help/gconf-editor/sl/figures/entry-number.png
share/gnome/help/gconf-editor/sl/figures/entry-schema.png
share/gnome/help/gconf-editor/sl/figures/entry-string.png
share/gnome/help/gconf-editor/sl/figures/gconf_editor_anno_window.png
share/gnome/help/gconf-editor/sl/gconf-editor.xml
share/gnome/help/gconf-editor/sv/
share/gnome/help/gconf-editor/sv/figures/
share/gnome/help/gconf-editor/sv/figures/entry-blank.png
@ -177,6 +187,21 @@ share/gnome/help/gconf-editor/zh_CN/figures/entry-schema.png
share/gnome/help/gconf-editor/zh_CN/figures/entry-string.png
share/gnome/help/gconf-editor/zh_CN/figures/gconf_editor_anno_window.png
share/gnome/help/gconf-editor/zh_CN/gconf-editor.xml
share/icons/hicolor/16x16/
share/icons/hicolor/16x16/apps/
share/icons/hicolor/16x16/apps/gconf-editor.png
share/icons/hicolor/22x22/
share/icons/hicolor/22x22/apps/
share/icons/hicolor/22x22/apps/gconf-editor.png
share/icons/hicolor/24x24/
share/icons/hicolor/24x24/apps/
share/icons/hicolor/24x24/apps/gconf-editor.png
share/icons/hicolor/256x256/
share/icons/hicolor/256x256/apps/
share/icons/hicolor/256x256/apps/gconf-editor.png
share/icons/hicolor/32x32/
share/icons/hicolor/32x32/apps/
share/icons/hicolor/32x32/apps/gconf-editor.png
share/icons/hicolor/48x48/
share/icons/hicolor/48x48/apps/
share/icons/hicolor/48x48/apps/gconf-editor.png
@ -203,6 +228,7 @@ share/locale/el/LC_MESSAGES/gconf-editor.mo
share/locale/en@shaw/LC_MESSAGES/gconf-editor.mo
share/locale/en_CA/LC_MESSAGES/gconf-editor.mo
share/locale/en_GB/LC_MESSAGES/gconf-editor.mo
share/locale/eo/LC_MESSAGES/gconf-editor.mo
share/locale/es/LC_MESSAGES/gconf-editor.mo
share/locale/et/LC_MESSAGES/gconf-editor.mo
share/locale/eu/LC_MESSAGES/gconf-editor.mo
@ -266,6 +292,7 @@ share/locale/xh/LC_MESSAGES/gconf-editor.mo
share/locale/zh_CN/LC_MESSAGES/gconf-editor.mo
share/locale/zh_HK/LC_MESSAGES/gconf-editor.mo
share/locale/zh_TW/LC_MESSAGES/gconf-editor.mo
share/omf/
share/omf/gconf-editor/
share/omf/gconf-editor/gconf-editor-C.omf
share/omf/gconf-editor/gconf-editor-ca.omf
@ -279,6 +306,7 @@ share/omf/gconf-editor/gconf-editor-it.omf
share/omf/gconf-editor/gconf-editor-oc.omf
share/omf/gconf-editor/gconf-editor-pt_BR.omf
share/omf/gconf-editor/gconf-editor-ru.omf
share/omf/gconf-editor/gconf-editor-sl.omf
share/omf/gconf-editor/gconf-editor-sv.omf
share/omf/gconf-editor/gconf-editor-th.omf
share/omf/gconf-editor/gconf-editor-uk.omf

57
graphics/evince/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.61 2011/05/28 08:15:53 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.62 2011/09/12 07:26:19 ajacoutot Exp $
SHARED_ONLY= Yes
@ -8,7 +8,7 @@ COMMENT-dvi= evince document viewer backend for dvi documents
COMMENT-nautilus= evince plugin for nautilus
GNOME_PROJECT= evince
GNOME_VERSION= 2.32.0
GNOME_VERSION= 3.0.2
MAJ_V= ${GNOME_VERSION:C/^([0-9]+\.[0-9]+).*/\1/}
SUBST_VARS= MAJ_V
@ -20,12 +20,13 @@ PKGNAME-djvu= evince-djvu-${GNOME_VERSION}
PKGNAME-dvi= evince-dvi-${GNOME_VERSION}
PKGNAME-nautilus= nautilus-evince-${GNOME_VERSION}
REVISION-main= 4
REVISION-nautilus= 0
REVISION-main= 1
REVISION-djvu= 0
REVISION-dvi= 0
REVISION-nautilus=0
SHARED_LIBS += evdocument 1.0 # .2.0
SHARED_LIBS += evview 1.0 # .2.0
SHARED_LIBS += evdocument3 0.0 # 3.0
SHARED_LIBS += evview3 0.0 # 3.0
HOMEPAGE= http://www.gnome.org/projects/evince/
@ -40,66 +41,64 @@ PERMIT_DISTFILES_CDROM= Yes
MODULES= devel/gettext \
x11/gnome \
devel/gconf2 \
devel/dconf
USE_GROFF = Yes
BUILD_DEPENDS= x11/gnome/icon-theme \
devel/gobject-introspection
devel/gobject-introspection \
devel/gsettings-desktop-schemas
WANTLIB += X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes
WANTLIB += Xi Xinerama Xrandr Xrender atk-1.0 cairo expat fontconfig
WANTLIB += freetype gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 glib-2.0
WANTLIB += gmodule-2.0 gobject-2.0 gtk-x11-2.0 m pango-1.0
WANTLIB += freetype gdk-3 gdk_pixbuf-2.0 gio-2.0 glib-2.0
WANTLIB += gmodule-2.0 gobject-2.0 gtk-3 pango-1.0
WANTLIB += pangocairo-1.0 pangoft2-1.0 pcre pixman-1 png pthread-stubs
WANTLIB += GL X11-xcb Xxf86vm drm xcb-shm
WANTLIB += xcb xcb-render z gthread-2.0
WANTLIB += GL Xxf86vm drm xcb-shm
WANTLIB += xcb xcb-render z gthread-2.0 cairo-gobject m
WANTLIB-main= ${WANTLIB} ICE ORBit-2 SM c dbus-1 \
LIB_DEPENDS= x11/gtk+3
WANTLIB-main= ${WANTLIB} ICE SM c dbus-1 gailutil-3 gdk-x11-2.0 \
gnome-keyring gs gcrypt gpg-error \
jpeg pthread tiff xml2 lcms openjpeg \
poppler poppler-glib spectre gnome-keyring \
gailutil stdc++ ${MODGCONF2_WANTLIB}
stdc++
LIB_DEPENDS-main= print/poppler \
print/libspectre \
x11/gnome/libgnome-keyring \
${MODGCONF2_LIB_DEPENDS} \
${MODGETTEXT_LIB_DEPENDS}
${LIB_DEPENDS}
RUN_DEPENDS-main= ${RUN_DEPENDS} \
devel/gsettings-desktop-schemas \
misc/shared-mime-info \
print/ghostscript/gnu \
x11/gnome/icon-theme
WANTLIB-djvu= ${WANTLIB} jpeg evdocument djvulibre
WANTLIB-djvu= ${WANTLIB} jpeg evdocument3 djvulibre
# port-lib-depends-check misses these ones because the depending lib
# is under lib/evince/3/backends/
# we don't need qt3 support in djvulibre, hence no_x11
LIB_DEPENDS-djvu= ${MODGETTEXT_LIB_DEPENDS} \
LIB_DEPENDS-djvu= ${LIB_DEPENDS} \
${BASE_PKGPATH} \
graphics/djvulibre,no_x11
RUN_DEPENDS-djvu= ${MODGCONF2_RUN_DEPENDS}
WANTLIB-dvi= ${WANTLIB} gs evdocument kpathsea spectre ICE SM
WANTLIB-dvi= ${WANTLIB} gs evdocument3 kpathsea spectre ICE SM \
c jpeg
# port-lib-depends-check misses these ones because the depending lib
# is under lib/evince/3/backends/
LIB_DEPENDS-dvi= ${MODGETTEXT_LIB_DEPENDS} \
LIB_DEPENDS-dvi= ${LIB_DEPENDS} \
${BASE_PKGPATH} \
print/texlive/base \
print/libspectre
RUN_DEPENDS-dvi= ${MODGCONF2_RUN_DEPENDS}
WANTLIB-nautilus= ${WANTLIB} gthread-2.0 nautilus-extension evdocument
WANTLIB-nautilus= ${WANTLIB} gthread-2.0 nautilus-extension evdocument3
LIB_DEPENDS-nautilus= ${BASE_PKGPATH} \
${MODGETTEXT_LIB_DEPENDS} \
${MODLIBICONV_LIB_DEPENDS} \
${LIB_DEPENDS} \
x11/gnome/nautilus
RUN_DEPENDS-nautilus=
MODGNOME_HELP_FILES= Yes
DESKTOP_FILES= Yes
MODGCONF2_SCHEMAS_DIR= evince
MODGCONF2_LIBDEP= No
LIBTOOL_FLAGS= --tag=disable-static
@ -112,12 +111,10 @@ CONFIGURE_ARGS+= ${CONFIGURE_SHARED} \
--disable-gtk-doc \
--disable-static \
--disable-comics \
--disable-impress \
--enable-introspection \
--enable-nautilus \
--enable-djvu \
--enable-dvi \
--enable-pixbuf
--enable-dvi
CONFIGURE_ENV= CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
CXXFLAGS="${CXXFLAGS} -I${LOCALBASE}/include" \

10
graphics/evince/distinfo
View File

@ -1,5 +1,5 @@
MD5 (evince-2.32.0.tar.bz2) = 68PObfjcvynLlJL43QMTGQ==
RMD160 (evince-2.32.0.tar.bz2) = otUmhawRm3DPQPMg3kV7PfusJYc=
SHA1 (evince-2.32.0.tar.bz2) = Lwaiud/YZn9LTG6QvjxJ9v4Cb8g=
SHA256 (evince-2.32.0.tar.bz2) = KkyRrjj4tQKM67kbnandxQ6orj89Qp34m6NR2i14f/c=
SIZE (evince-2.32.0.tar.bz2) = 2295272
MD5 (evince-3.0.2.tar.bz2) = Tv95DZunoNno7aW0u5HJKw==
RMD160 (evince-3.0.2.tar.bz2) = tiRyCIooPg0mdaBLZbPI8gS41UA=
SHA1 (evince-3.0.2.tar.bz2) = 6HQ11stCuWY8QUaRYDvftCbf5kA=
SHA256 (evince-3.0.2.tar.bz2) = A6u3RiDKqiVfLRNptoS7+PYuFaS/LZ8qRfWOF4kpWpc=
SIZE (evince-3.0.2.tar.bz2) = 3016468

16
graphics/evince/patches/patch-backend_dvi_mdvi-lib_afmparse_c
View File

@ -1,16 +0,0 @@
$OpenBSD: patch-backend_dvi_mdvi-lib_afmparse_c,v 1.1 2011/01/06 22:55:31 jasper Exp $
Security fixes for CVE-2010-2640, CVE-2010-2641, CVE-2010-2642, CVE-2010-2643.
Patch from upstream git: d4139205b010ed06310d14284e63114e88ec6de2.
--- backend/dvi/mdvi-lib/afmparse.c.orig Fri Apr 24 09:24:16 2009
+++ backend/dvi/mdvi-lib/afmparse.c Thu Jan 6 23:35:24 2011
@@ -160,7 +160,7 @@ static char *token(FILE *stream)
idx = 0;
while (ch != EOF && ch != ' ' && ch != lineterm
- && ch != '\t' && ch != ':' && ch != ';')
+ && ch != '\t' && ch != ':' && ch != ';' && idx < MAX_NAME)
{
ident[idx++] = ch;
ch = fgetc(stream);

18
graphics/evince/patches/patch-backend_dvi_mdvi-lib_dviread_c
View File

@ -1,18 +0,0 @@
$OpenBSD: patch-backend_dvi_mdvi-lib_dviread_c,v 1.1 2011/01/06 22:55:31 jasper Exp $
Security fixes for CVE-2010-2640, CVE-2010-2641, CVE-2010-2642, CVE-2010-2643.
Patch from upstream git: d4139205b010ed06310d14284e63114e88ec6de2.
--- backend/dvi/mdvi-lib/dviread.c.orig Wed Jul 14 09:54:39 2010
+++ backend/dvi/mdvi-lib/dviread.c Thu Jan 6 23:35:24 2011
@@ -1537,6 +1537,10 @@ int special(DviContext *dvi, int opcode)
Int32 arg;
arg = dugetn(dvi, opcode - DVI_XXX1 + 1);
+ if (arg <= 0) {
+ dvierr(dvi, _("malformed special length\n"));
+ return -1;
+ }
s = mdvi_malloc(arg + 1);
dread(dvi, s, arg);
s[arg] = 0;

32
graphics/evince/patches/patch-backend_dvi_mdvi-lib_pk_c
View File

@ -1,32 +0,0 @@
$OpenBSD: patch-backend_dvi_mdvi-lib_pk_c,v 1.1 2011/01/06 22:55:31 jasper Exp $
Security fixes for CVE-2010-2640, CVE-2010-2641, CVE-2010-2642, CVE-2010-2643.
Patch from upstream git: d4139205b010ed06310d14284e63114e88ec6de2.
--- backend/dvi/mdvi-lib/pk.c.orig Wed Jul 14 09:54:39 2010
+++ backend/dvi/mdvi-lib/pk.c Thu Jan 6 23:35:24 2011
@@ -469,6 +469,15 @@ static int pk_load_font(DviParams *unused, DviFont *fo
}
if(feof(p))
break;
+
+ /* Although the PK format support bigger char codes,
+ * XeTeX and other extended TeX engines support charcodes up to
+ * 65536, while normal TeX engine supports only charcode up to 255.*/
+ if (cc < 0 || cc > 65536) {
+ mdvi_error (_("%s: unexpected charcode (%d)\n"),
+ font->fontname,cc);
+ goto error;
+ }
if(cc < loc)
loc = cc;
if(cc > hic)
@@ -512,7 +521,7 @@ static int pk_load_font(DviParams *unused, DviFont *fo
}
/* resize font char data */
- if(loc > 0 || hic < maxch-1) {
+ if(loc > 0 && hic < maxch-1) {
memmove(font->chars, font->chars + loc,
(hic - loc + 1) * sizeof(DviFontChar));
font->chars = xresize(font->chars,

17
graphics/evince/patches/patch-backend_dvi_mdvi-lib_tfmfile_c
View File

@ -1,17 +0,0 @@
$OpenBSD: patch-backend_dvi_mdvi-lib_tfmfile_c,v 1.1 2011/01/06 22:55:31 jasper Exp $
Security fixes for CVE-2010-2640, CVE-2010-2641, CVE-2010-2642, CVE-2010-2643.
Patch from upstream git: d4139205b010ed06310d14284e63114e88ec6de2.
--- backend/dvi/mdvi-lib/tfmfile.c.orig Wed Jul 14 09:54:39 2010
+++ backend/dvi/mdvi-lib/tfmfile.c Thu Jan 6 23:35:24 2011
@@ -172,7 +172,8 @@ int tfm_load_file(const char *filename, TFMInfo *info)
/* We read the entire TFM file into core */
if(fstat(fileno(in), &st) < 0)
return -1;
- if(st.st_size == 0)
+ /* according to the spec, TFM files are smaller than 16K */
+ if(st.st_size == 0 || st.st_size >= 16384)
goto bad_tfm;
/* allocate a word-aligned buffer to hold the file */

16
graphics/evince/patches/patch-backend_dvi_mdvi-lib_vf_c
View File

@ -1,16 +0,0 @@
$OpenBSD: patch-backend_dvi_mdvi-lib_vf_c,v 1.1 2011/01/06 22:55:31 jasper Exp $
--- backend/dvi/mdvi-lib/vf.c.orig Wed Jul 14 09:54:39 2010
+++ backend/dvi/mdvi-lib/vf.c Thu Jan 6 23:35:24 2011
@@ -165,6 +165,12 @@ static int vf_load_font(DviParams *params, DviFont *fo
cc = fuget1(p);
tfm = fuget3(p);
}
+ if (cc < 0 || cc > 65536) {
+ /* TeX engines do not support char codes bigger than 65535 */
+ mdvi_error(_("(vf) %s: unexpected character %d\n"),
+ font->fontname, cc);
+ goto error;
+ }
if(loc < 0 || cc < loc)
loc = cc;
if(hic < 0 || cc > hic)

5
graphics/evince/pkg/PLIST-djvu
View File

@ -1,7 +1,4 @@
@comment $OpenBSD: PLIST-djvu,v 1.6 2010/10/14 14:31:01 ajacoutot Exp $
@comment $OpenBSD: PLIST-djvu,v 1.7 2011/09/12 07:26:19 ajacoutot Exp $
lib/evince/3/backends/djvudocument.evince-backend
@comment lib/evince/3/backends/libdjvudocument.la
lib/evince/3/backends/libdjvudocument.so
@unexec GCONF_CONFIG_SOURCE=`%D/bin/gconftool-2 --get-default-source` %D/bin/gconftool-2 --makefile-uninstall-rule %D/${SCHEMAS_INSTDIR}/*.schemas > /dev/null
${SCHEMAS_INSTDIR}/evince-thumbnailer-djvu.schemas
@exec GCONF_CONFIG_SOURCE=`%D/bin/gconftool-2 --get-default-source` %D/bin/gconftool-2 --makefile-install-rule %D/${SCHEMAS_INSTDIR}/*.schemas > /dev/null

5
graphics/evince/pkg/PLIST-dvi
View File

@ -1,7 +1,4 @@
@comment $OpenBSD: PLIST-dvi,v 1.6 2010/10/14 14:31:01 ajacoutot Exp $
@comment $OpenBSD: PLIST-dvi,v 1.7 2011/09/12 07:26:19 ajacoutot Exp $
lib/evince/3/backends/dvidocument.evince-backend
@comment lib/evince/3/backends/libdvidocument.la
lib/evince/3/backends/libdvidocument.so
@unexec GCONF_CONFIG_SOURCE=`%D/bin/gconftool-2 --get-default-source` %D/bin/gconftool-2 --makefile-uninstall-rule %D/${SCHEMAS_INSTDIR}/*.schemas > /dev/null
${SCHEMAS_INSTDIR}/evince-thumbnailer-dvi.schemas
@exec GCONF_CONFIG_SOURCE=`%D/bin/gconftool-2 --get-default-source` %D/bin/gconftool-2 --makefile-install-rule %D/${SCHEMAS_INSTDIR}/*.schemas > /dev/null

2006
graphics/evince/pkg/PLIST-main
View File

File diff suppressed because it is too large Load Diff

8
graphics/evince/pkg/PLIST-nautilus
View File

@ -1,5 +1,3 @@
@comment $OpenBSD: PLIST-nautilus,v 1.2 2010/12/01 14:46:59 ajacoutot Exp $
lib/nautilus/
lib/nautilus/extensions-2.0/
@comment lib/nautilus/extensions-2.0/libevince-properties-page.la
lib/nautilus/extensions-2.0/libevince-properties-page.so
@comment $OpenBSD: PLIST-nautilus,v 1.3 2011/09/12 07:26:19 ajacoutot Exp $
@comment lib/nautilus/extensions-${MAJ_V}/libevince-properties-page.la
lib/nautilus/extensions-${MAJ_V}/libevince-properties-page.so

85
mail/evolution-exchange/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.18 2011/04/22 07:48:46 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.19 2011/09/12 07:26:19 ajacoutot Exp $
# No NTLM support in OpenLDAP; Plaintext password authentication will be
# used when connecting to the Global Catalog server. Consider installing
@ -7,14 +7,19 @@
SHARED_ONLY= Yes
COMMENT= Evolution connector for MS Exchange
COMMENT= evolution connector for MS Exchange
GNOME_PROJECT= evolution-exchange
GNOME_VERSION= 2.32.3
GNOME_VERSION= 3.0.3
EXTRACT_SUFX= .tar.xz
SHARED_LIBS += exchange 0.0 # 0.0
SHARED_LIBS += xntlm 0.0 # 0.0
CATEGORIES= mail
EVO_VERSION= 2.32
EVO_VERSION= 3.0
SUBST_VARS= EVO_VERSION
HOMEPAGE= http://projects.gnome.org/evolution/
@ -28,66 +33,64 @@ PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
WANTLIB += ICE ORBit-2 SM X11 Xau Xcomposite Xcursor Xdamage Xdmcp
WANTLIB += Xext Xfixes Xi Xinerama Xrandr Xrender asn1
WANTLIB += atk-1.0 c cairo camel-1.2 camel-provider-1.2 canberra
WANTLIB += canberra-gtk com_err crypto db dbus-1 dbus-glib-1 ebackend-1.2
WANTLIB += ebook-1.2 ecal-1.2 edata-book-1.2 edata-cal-1.2 edataserver-1.2
WANTLIB += edataserverui-1.2 egroupwise-1.2 enchant
WANTLIB += execinfo expat fontconfig freetype gailutil gcrypt
WANTLIB += gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 glib-2.0 gmodule-2.0
WANTLIB += gnome-desktop-2 gnome-keyring
WANTLIB += gobject-2.0 gpg-error gssapi gthread-2.0 gtk-x11-2.0
WANTLIB += gtkhtml-3.14 ical icalss icalvcal krb5
WANTLIB += ltdl m nspr4 nss3 ogg pango-1.0 pangocairo-1.0
WANTLIB += pangoft2-1.0 pcre pixman-1 plc4 plds4 png pthread pthread-stubs
WANTLIB += sasl2 smime3 soup-2.4 sqlite3 ssl ssl3 startup-notification-1
WANTLIB += stdc++ unique-1.0 vorbis vorbisfile xcb xcb-atom
WANTLIB += xcb-aux xcb-event xcb-render xml2 z
WANTLIB += gdata gtkhtml-editor-3.14 lber-2.4 ldap-2.4 nssutil3
WANTLIB += soup-gnome-2.4 GL Xxf86vm drm softokn3 xcb-shm
WANTLIB += lib/evolution/${EVO_VERSION}/art_lgpl
WANTLIB += lib/evolution/${EVO_VERSION}/gnomecanvas
WANTLIB += lib/evolution/${EVO_VERSION}/essmime
WANTLIB += lib/evolution/${EVO_VERSION}/emformat
WANTLIB += lib/evolution/${EVO_VERSION}/evolution-mail
WANTLIB += lib/evolution/${EVO_VERSION}/evolution-smime
WANTLIB += lib/evolution/${EVO_VERSION}/filter
WANTLIB += lib/evolution/${EVO_VERSION}/menus
WANTLIB += GL ICE ORBit-2 SM X11 X11-xcb Xau Xcomposite Xcursor
WANTLIB += Xdamage Xdmcp Xext Xfixes Xi Xinerama Xrandr Xrender
WANTLIB += Xxf86vm asn1 atk-1.0 c cairo cairo-gobject camel-1.2
WANTLIB += camel-provider-1.2 canberra canberra-gtk3 com_err crypto
WANTLIB += db dbus-1 dbus-glib-1 drm ebackend-1.2 ebook-1.2 ecal-1.2
WANTLIB += edata-book-1.2 edata-cal-1.2 edataserver-1.2 edataserverui-3.0
WANTLIB += egroupwise-1.2 enchant execinfo expat fontconfig freetype
WANTLIB += gailutil-3 gcrypt gdk-3 gdk_pixbuf-2.0 gio-2.0 glib-2.0
WANTLIB += gmodule-2.0 gnome-desktop-3 gnome-keyring gobject-2.0
WANTLIB += gpg-error gssapi gthread-2.0 gtk-3 gtkhtml-4.0 gtkhtml-editor-4.0
WANTLIB += ical icalss icalvcal krb5 lber-2.4 ldap-2.4 ltdl m
WANTLIB += nspr4 nss3 nssutil3 ogg pango-1.0 pangocairo-1.0 pangoft2-1.0
WANTLIB += pcre pixman-1 plc4 plds4 png pthread pthread-stubs
WANTLIB += sasl2 smime3 softokn3 soup-2.4 sqlite3 ssl ssl3 startup-notification-1
WANTLIB += stdc++ unique-3.0 vorbis vorbisfile xcb xcb-aux xcb-render
WANTLIB += xcb-shm xml2 z
WANTLIB += lib/evolution/${EVO_VERSION}/composer
WANTLIB += lib/evolution/${EVO_VERSION}/eabutil
WANTLIB += lib/evolution/${EVO_VERSION}/econtacteditor
WANTLIB += lib/evolution/${EVO_VERSION}/econtactlisteditor
WANTLIB += lib/evolution/${EVO_VERSION}/composer
WANTLIB += lib/evolution/${EVO_VERSION}/eshell
WANTLIB += lib/evolution/${EVO_VERSION}/emformat
WANTLIB += lib/evolution/${EVO_VERSION}/emiscwidgets
WANTLIB += lib/evolution/${EVO_VERSION}/eshell.
WANTLIB += lib/evolution/${EVO_VERSION}/essmime
WANTLIB += lib/evolution/${EVO_VERSION}/etable
WANTLIB += lib/evolution/${EVO_VERSION}/etext
WANTLIB += lib/evolution/${EVO_VERSION}/evolution-a11y
WANTLIB += lib/evolution/${EVO_VERSION}/emiscwidgets
WANTLIB += lib/evolution/${EVO_VERSION}/eutil
WANTLIB += lib/evolution/${EVO_VERSION}/evolution-a11y
WANTLIB += lib/evolution/${EVO_VERSION}/evolution-mail.
WANTLIB += lib/evolution/${EVO_VERSION}/evolution-smime
WANTLIB += lib/evolution/${EVO_VERSION}/filter
WANTLIB += lib/evolution/${EVO_VERSION}/gnomecanvas
WANTLIB += lib/evolution/${EVO_VERSION}/menus
MODULES= devel/gettext \
x11/gnome \
devel/gconf2
LIB_DEPENDS= mail/evolution,-main>=2.32.2
LIB_DEPENDS= mail/evolution,-main>=3.0.2
LIBTOOL_FLAGS= --tag=disable-static
MODGCONF2_SCHEMAS_DIR= evolution-exchange
CONFIGURE_STYLE= gnu
AUTOCONF_VERSION=2.68
AUTOMAKE_VERSION=1.9
CONFIGURE_STYLE= autoconf
CONFIGURE_ARGS= ${CONFIGURE_SHARED} \
--disable-gtk-doc \
--disable-static \
--disable-gtk-doc \
--with-krb5=/usr \
--with-krb5-includes=/usr/include/kerberosV \
--with-static-ldap=no \
--with-openldap=${LOCALBASE} \
--with-libdb=${LOCALBASE}
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/db4" \
LDFLAGS="-L${LOCALBASE}/lib"
pre-configure:
perl -pi -e 's,-lpthread,-pthread,g' ${WRKSRC}/configure
LDFLAGS="-L${LOCALBASE}/lib \
-Wl,-rpath,${TRUEPREFIX}/lib/evolution-exchange/${EVO_VERSION}:${TRUEPREFIX}/lib"
.include <bsd.port.mk>

10
mail/evolution-exchange/distinfo
View File

@ -1,5 +1,5 @@
MD5 (evolution-exchange-2.32.3.tar.bz2) = 7fokGCXYYMdnmAc5RaoOmA==
RMD160 (evolution-exchange-2.32.3.tar.bz2) = z/rSVKov0xrhvSZVy9u0GGpcoxw=
SHA1 (evolution-exchange-2.32.3.tar.bz2) = t7aJbZjrPbqdKmda/MK5hIBPbMQ=
SHA256 (evolution-exchange-2.32.3.tar.bz2) = KZPQjRb9iqwroKOXRVpDyjk5gDe0n/wVi7bS5wB3FiE=
SIZE (evolution-exchange-2.32.3.tar.bz2) = 1308675
MD5 (evolution-exchange-3.0.3.tar.xz) = ks1A1e6v7jHbUioIK7T7hQ==
RMD160 (evolution-exchange-3.0.3.tar.xz) = CnJNvU+ENL9yQ07tUchDp5zPaVk=
SHA1 (evolution-exchange-3.0.3.tar.xz) = K7ZxAuCVnstZPGqTJ23zfFxUbQg=
SHA256 (evolution-exchange-3.0.3.tar.xz) = RXQAF/UJ9FzC66UlAi2ogoAXrZhzcXm0UNMXe0abMNc=
SIZE (evolution-exchange-3.0.3.tar.xz) = 1099668

12
mail/evolution-exchange/patches/patch-configure
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-configure,v 1.5 2011/03/07 19:41:32 ajacoutot Exp $
--- configure.orig Sun Feb 6 06:13:28 2011
+++ configure Sat Feb 26 22:54:52 2011
@@ -15618,7 +15618,7 @@ $as_echo_n "checking for Kerberos 5... " >&6; }
LIBS_save="$LIBS"
mitlibs="-lkrb5 -lk5crypto -lcom_err -lgssapi_krb5"
- heimlibs="-lkrb5 -lcrypto -lasn1 -lcom_err -lroken -lgssapi"
+ heimlibs="-lkrb5 -lcrypto -lasn1 -lcom_err -lgssapi"
sunlibs="-lkrb5 -lgss"
if test "${ac_cv_lib_kerberos5+set}" = set; then :
$as_echo_n "(cached) " >&6

29
mail/evolution-exchange/patches/patch-configure_ac Normal file
View File

@ -0,0 +1,29 @@
$OpenBSD: patch-configure_ac,v 1.1 2011/09/12 07:26:19 ajacoutot Exp $
https://bugzilla.gnome.org/show_bug.cgi?id=654540
--- configure.ac.orig Mon Apr 25 09:03:03 2011
+++ configure.ac Wed Jul 13 12:17:29 2011
@@ -94,13 +94,22 @@ dnl ******************************
dnl Check for Win32
dnl ******************************
+AC_CANONICAL_HOST
AC_MSG_CHECKING([for Win32])
+
+dnl This must stay after AC_CANONICAL_HOST, which defines $host.
case "$host" in
*-mingw*)
os_win32=yes
NO_UNDEFINED='-Wl,--no-undefined'
SOCKET_LIBS='-lws2_32'
DNS_LIBS='-ldnsapi'
+ ;;
+*openbsd*|*freebsd*)
+ os_win32=no
+ NO_UNDEFINED=''
+ SOCKET_LIBS=''
+ DNS_LIBS=''
;;
*)
os_win32=no

93
mail/evolution-exchange/patches/patch-eplugin_exchange-delegates-user_c
View File

@ -1,93 +0,0 @@
$OpenBSD: patch-eplugin_exchange-delegates-user_c,v 1.1 2011/03/07 19:41:32 ajacoutot Exp $
From e9596e5a2f5e2c1bc5c8700eafc3ead17f819020 Mon Sep 17 00:00:00 2001
From: Milan Crha <mcrha@redhat.com>
Date: Tue, 26 Oct 2010 08:38:22 +0000
Subject: Be able to compile against Gtk+ 2.23.0
--- eplugin/exchange-delegates-user.c.orig Tue Nov 2 11:32:25 2010
+++ eplugin/exchange-delegates-user.c Sun Feb 13 15:47:05 2011
@@ -42,6 +42,8 @@
#include <string.h>
+#include "gtk-compat.h"
+
#define EXCHANGE_DELEGATES_USER_CUSTOM -3
/* Can't use E2K_PERMISSIONS_ROLE_CUSTOM, because it's -1, which
* means "end of list" to e_dialog_combo_box_get/set
@@ -129,7 +131,7 @@ static void
set_perms (GtkWidget *combobox, E2kPermissionsRole role)
{
if (!is_delegate_role (role)) {
- gtk_combo_box_append_text (GTK_COMBO_BOX (combobox), _("Custom"));
+ gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combobox), _("Custom"));
role = EXCHANGE_DELEGATES_USER_CUSTOM;
}
@@ -287,45 +289,45 @@ exchange_delegates_user_edit (ExchangeAccount *account
gtk_label_set_justify (GTK_LABEL (contact_label), GTK_JUSTIFY_CENTER);
gtk_misc_set_alignment (GTK_MISC (contact_label), 0, 0.5);
- calendar_perms_combobox = gtk_combo_box_new_text ();
+ calendar_perms_combobox = gtk_combo_box_text_new ();
gtk_widget_show (calendar_perms_combobox);
gtk_table_attach (GTK_TABLE (folders_table), calendar_perms_combobox, 1, 2, 0, 1,
(GtkAttachOptions) (GTK_FILL),
(GtkAttachOptions) (GTK_FILL), 0, 0);
- gtk_combo_box_append_text (GTK_COMBO_BOX (calendar_perms_combobox), _("None"));
- gtk_combo_box_append_text (GTK_COMBO_BOX (calendar_perms_combobox), _("Reviewer (read-only)"));
- gtk_combo_box_append_text (GTK_COMBO_BOX (calendar_perms_combobox), _("Author (read, create)"));
- gtk_combo_box_append_text (GTK_COMBO_BOX (calendar_perms_combobox), _("Editor (read, create, edit)"));
+ gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (calendar_perms_combobox), _("None"));
+ gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (calendar_perms_combobox), _("Reviewer (read-only)"));
+ gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (calendar_perms_combobox), _("Author (read, create)"));
+ gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (calendar_perms_combobox), _("Editor (read, create, edit)"));
- task_perms_combobox = gtk_combo_box_new_text ();
+ task_perms_combobox = gtk_combo_box_text_new ();
gtk_widget_show (task_perms_combobox);
gtk_table_attach (GTK_TABLE (folders_table), task_perms_combobox, 1, 2, 1, 2,
(GtkAttachOptions) (GTK_FILL),
(GtkAttachOptions) (GTK_FILL), 0, 0);
- gtk_combo_box_append_text (GTK_COMBO_BOX (task_perms_combobox), _("None"));
- gtk_combo_box_append_text (GTK_COMBO_BOX (task_perms_combobox), _("Reviewer (read-only)"));
- gtk_combo_box_append_text (GTK_COMBO_BOX (task_perms_combobox), _("Author (read, create)"));
- gtk_combo_box_append_text (GTK_COMBO_BOX (task_perms_combobox), _("Editor (read, create, edit)"));
+ gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (task_perms_combobox), _("None"));
+ gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (task_perms_combobox), _("Reviewer (read-only)"));
+ gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (task_perms_combobox), _("Author (read, create)"));
+ gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (task_perms_combobox), _("Editor (read, create, edit)"));
- inbox_perms_combobox = gtk_combo_box_new_text ();
+ inbox_perms_combobox = gtk_combo_box_text_new ();
gtk_widget_show (inbox_perms_combobox);
gtk_table_attach (GTK_TABLE (folders_table), inbox_perms_combobox, 1, 2, 2, 3,
(GtkAttachOptions) (GTK_FILL),
(GtkAttachOptions) (GTK_FILL), 0, 0);
- gtk_combo_box_append_text (GTK_COMBO_BOX (inbox_perms_combobox), _("None"));
- gtk_combo_box_append_text (GTK_COMBO_BOX (inbox_perms_combobox), _("Reviewer (read-only)"));
- gtk_combo_box_append_text (GTK_COMBO_BOX (inbox_perms_combobox), _("Author (read, create)"));
- gtk_combo_box_append_text (GTK_COMBO_BOX (inbox_perms_combobox), _("Editor (read, create, edit)"));
+ gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (inbox_perms_combobox), _("None"));
+ gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (inbox_perms_combobox), _("Reviewer (read-only)"));
+ gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (inbox_perms_combobox), _("Author (read, create)"));
+ gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (inbox_perms_combobox), _("Editor (read, create, edit)"));
- contact_perms_combobox = gtk_combo_box_new_text ();
+ contact_perms_combobox = gtk_combo_box_text_new ();
gtk_widget_show (contact_perms_combobox);
gtk_table_attach (GTK_TABLE (folders_table), contact_perms_combobox, 1, 2, 3, 4,
(GtkAttachOptions) (GTK_FILL),
(GtkAttachOptions) (GTK_FILL), 0, 0);
- gtk_combo_box_append_text (GTK_COMBO_BOX (contact_perms_combobox), _("None"));
- gtk_combo_box_append_text (GTK_COMBO_BOX (contact_perms_combobox), _("Reviewer (read-only)"));
- gtk_combo_box_append_text (GTK_COMBO_BOX (contact_perms_combobox), _("Author (read, create)"));
- gtk_combo_box_append_text (GTK_COMBO_BOX (contact_perms_combobox), _("Editor (read, create, edit)"));
+ gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (contact_perms_combobox), _("None"));
+ gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (contact_perms_combobox), _("Reviewer (read-only)"));
+ gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (contact_perms_combobox), _("Author (read, create)"));
+ gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (contact_perms_combobox), _("Editor (read, create, edit)"));
delegate_mail = gtk_check_button_new_with_mnemonic (_("_Summarize permissions"));
gtk_widget_show (delegate_mail);

98
mail/evolution-exchange/patches/patch-eplugin_exchange-folder-subscription_c
View File

@ -1,98 +0,0 @@
$OpenBSD: patch-eplugin_exchange-folder-subscription_c,v 1.1 2011/03/07 19:41:32 ajacoutot Exp $
From e9596e5a2f5e2c1bc5c8700eafc3ead17f819020 Mon Sep 17 00:00:00 2001
From: Milan Crha <mcrha@redhat.com>
Date: Tue, 26 Oct 2010 08:38:22 +0000
Subject: Be able to compile against Gtk+ 2.23.0
--- eplugin/exchange-folder-subscription.c.orig Tue Nov 2 11:32:25 2010
+++ eplugin/exchange-folder-subscription.c Sun Feb 13 15:47:05 2011
@@ -38,6 +38,7 @@
#include "exchange-config-listener.h"
#include "exchange-folder-subscription.h"
#include "exchange-operations.h"
+#include "gtk-compat.h"
static void
user_response (ENameSelectorDialog *name_selector_dialog, gint response, gpointer data)
@@ -63,7 +64,7 @@ setup_name_selector (GtkWidget *placeholder, GtkWidget
ENameSelectorDialog *name_selector_dialog;
GtkWidget *widget;
- g_assert (GTK_IS_CONTAINER (placeholder));
+ g_return_val_if_fail (GTK_IS_CONTAINER (placeholder), NULL);
name_selector = e_name_selector_new ();
@@ -89,7 +90,7 @@ setup_name_selector (GtkWidget *placeholder, GtkWidget
static void
setup_folder_name_combo (GtkWidget *widget, const gchar *fname)
{
- GtkComboBox *combo;
+ GtkComboBoxText *combo;
const gchar *strings[] = {
"Calendar",
"Inbox",
@@ -100,13 +101,13 @@ setup_folder_name_combo (GtkWidget *widget, const gcha
};
gint i;
- combo = GTK_COMBO_BOX (widget);
- g_assert (GTK_IS_COMBO_BOX_ENTRY (combo));
+ combo = GTK_COMBO_BOX_TEXT (widget);
+ g_return_if_fail (GTK_IS_COMBO_BOX_TEXT (combo));
- gtk_list_store_clear (GTK_LIST_STORE (gtk_combo_box_get_model (combo)));
+ gtk_list_store_clear (GTK_LIST_STORE (gtk_combo_box_get_model (GTK_COMBO_BOX (combo))));
for (i = 0; strings[i] != NULL; i++)
- gtk_combo_box_append_text (combo, strings[i]);
+ gtk_combo_box_text_append_text (combo, strings[i]);
gtk_entry_set_text (GTK_ENTRY (gtk_bin_get_child (GTK_BIN (combo))), fname);
}
@@ -139,11 +140,11 @@ user_name_entry_changed_callback (GtkEditable *editabl
static void
setup_server_combobox (GtkWidget *widget, gchar *mail_account)
{
- g_return_if_fail (GTK_IS_COMBO_BOX (widget));
+ g_return_if_fail (GTK_IS_COMBO_BOX_TEXT (widget));
gtk_list_store_clear (GTK_LIST_STORE (gtk_combo_box_get_model (GTK_COMBO_BOX (widget))));
- gtk_combo_box_append_text (GTK_COMBO_BOX (widget), mail_account);
+ gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (widget), mail_account);
gtk_combo_box_set_active (GTK_COMBO_BOX (widget), 0);
/* FIXME: Default to the current storage in the shell view. */
@@ -345,13 +346,29 @@ create_folder_subscription_dialog (ExchangeAccount *ac
(GtkAttachOptions) (GTK_FILL),
(GtkAttachOptions) (0), 0, 0);
+#if GTK_CHECK_VERSION(2,23,0)
+ /* FIXME Rewrite this when removing the version check. */
+ {
+ GtkListStore *store;
+
+ store = gtk_list_store_new (1, G_TYPE_STRING);
+ folder_name_combo = g_object_new (
+ GTK_TYPE_COMBO_BOX,
+ "model", store,
+ "has-entry", TRUE,
+ "entry-text-column", 0,
+ NULL);
+ g_object_unref (store);
+ }
+#else
folder_name_combo = gtk_combo_box_entry_new_text ();
+#endif
gtk_widget_show (folder_name_combo);
gtk_table_attach (GTK_TABLE (table1), folder_name_combo, 1, 2, 2, 3,
(GtkAttachOptions) (GTK_FILL),
(GtkAttachOptions) (GTK_FILL), 0, 0);
- server_combobox = gtk_combo_box_new_text ();
+ server_combobox = gtk_combo_box_text_new ();
gtk_widget_show (server_combobox);
gtk_table_attach (GTK_TABLE (table1), server_combobox, 1, 2, 0, 1,
(GtkAttachOptions) (GTK_FILL),

49
mail/evolution-exchange/patches/patch-eplugin_exchange-permissions-dialog_c
View File

@ -1,49 +0,0 @@
$OpenBSD: patch-eplugin_exchange-permissions-dialog_c,v 1.1 2011/03/07 19:41:32 ajacoutot Exp $
From e9596e5a2f5e2c1bc5c8700eafc3ead17f819020 Mon Sep 17 00:00:00 2001
From: Milan Crha <mcrha@redhat.com>
Date: Tue, 26 Oct 2010 08:38:22 +0000
Subject: Be able to compile against Gtk+ 2.23.0
--- eplugin/exchange-permissions-dialog.c.orig Tue Nov 2 11:32:25 2010
+++ eplugin/exchange-permissions-dialog.c Sun Feb 13 15:47:05 2011
@@ -42,6 +42,8 @@
#include <e-util/e-dialog-utils.h>
#include <e-util/e-alert-dialog.h>
+#include "gtk-compat.h"
+
struct _ExchangePermissionsDialogPrivate {
ExchangeAccount *account;
gchar *base_uri, *folder_path;
@@ -542,14 +544,14 @@ display_role (ExchangePermissionsDialog *dialog)
if (role == E2K_PERMISSIONS_ROLE_CUSTOM) {
if (dialog->priv->custom_added == FALSE) {
- gtk_combo_box_append_text (GTK_COMBO_BOX (dialog->priv->role_optionmenu), _("Custom"));
+ gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (dialog->priv->role_optionmenu), _("Custom"));
dialog->priv->custom_added = TRUE;
}
role = E2K_PERMISSIONS_ROLE_NUM_ROLES;
}
else {
if (dialog->priv->custom_added) {
- gtk_combo_box_remove_text (GTK_COMBO_BOX (dialog->priv->role_optionmenu), E2K_PERMISSIONS_ROLE_NUM_ROLES);
+ gtk_combo_box_text_remove (GTK_COMBO_BOX_TEXT (dialog->priv->role_optionmenu), E2K_PERMISSIONS_ROLE_NUM_ROLES);
dialog->priv->custom_added = FALSE;
}
}
@@ -680,11 +682,11 @@ exchange_permissions_role_optionmenu_new (void)
const gchar **roles;
gint role;
- menu = gtk_combo_box_new_text ();
+ menu = gtk_combo_box_text_new ();
roles = g_new (const gchar *, E2K_PERMISSIONS_ROLE_NUM_ROLES + 1);
for (role = 0; role < E2K_PERMISSIONS_ROLE_NUM_ROLES; role++) {
roles[role] = e2k_permissions_role_get_name (role);
- gtk_combo_box_append_text (GTK_COMBO_BOX (menu), roles[role]);
+ gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (menu), roles[role]);
}
roles[role] = NULL;

51
mail/evolution-exchange/patches/patch-eplugin_exchange-send-options_c
View File

@ -1,51 +0,0 @@
$OpenBSD: patch-eplugin_exchange-send-options_c,v 1.1 2011/03/07 19:41:32 ajacoutot Exp $
From e9596e5a2f5e2c1bc5c8700eafc3ead17f819020 Mon Sep 17 00:00:00 2001
From: Milan Crha <mcrha@redhat.com>
Date: Tue, 26 Oct 2010 08:38:22 +0000
Subject: Be able to compile against Gtk+ 2.23.0
--- eplugin/exchange-send-options.c.orig Tue Nov 2 11:32:25 2010
+++ eplugin/exchange-send-options.c Sun Feb 13 15:47:05 2011
@@ -32,6 +32,7 @@
#include <e-util/e-alert-dialog.h>
#include "exchange-send-options.h"
+#include "gtk-compat.h"
G_DEFINE_TYPE (ExchangeSendOptionsDialog, exchange_sendoptions_dialog, G_TYPE_OBJECT)
@@ -385,24 +386,24 @@ exchange_sendoptions_dialog_run (ExchangeSendOptionsDi
(GtkAttachOptions) (0), 0, 0);
gtk_misc_set_alignment (GTK_MISC (sensitivity_label), 0, 0.5);
- sensitivity_combo_box = gtk_combo_box_new_text ();
+ sensitivity_combo_box = gtk_combo_box_text_new ();
gtk_widget_show (sensitivity_combo_box);
gtk_table_attach (GTK_TABLE (msg_settings_table), sensitivity_combo_box, 1, 2, 1, 2,
(GtkAttachOptions) (GTK_FILL),
(GtkAttachOptions) (GTK_FILL), 0, 0);
- gtk_combo_box_append_text (GTK_COMBO_BOX (sensitivity_combo_box), _("Normal"));
- gtk_combo_box_append_text (GTK_COMBO_BOX (sensitivity_combo_box), _("Personal"));
- gtk_combo_box_append_text (GTK_COMBO_BOX (sensitivity_combo_box), _("Private"));
- gtk_combo_box_append_text (GTK_COMBO_BOX (sensitivity_combo_box), _("Confidential"));
+ gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (sensitivity_combo_box), _("Normal"));
+ gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (sensitivity_combo_box), _("Personal"));
+ gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (sensitivity_combo_box), _("Private"));
+ gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (sensitivity_combo_box), _("Confidential"));
- imp_combo_box = gtk_combo_box_new_text ();
+ imp_combo_box = gtk_combo_box_text_new ();
gtk_widget_show (imp_combo_box);
gtk_table_attach (GTK_TABLE (msg_settings_table), imp_combo_box, 1, 2, 0, 1,
(GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
(GtkAttachOptions) (GTK_FILL), 0, 0);
- gtk_combo_box_append_text (GTK_COMBO_BOX (imp_combo_box), _("Normal"));
- gtk_combo_box_append_text (GTK_COMBO_BOX (imp_combo_box), _("High"));
- gtk_combo_box_append_text (GTK_COMBO_BOX (imp_combo_box), _("Low"));
+ gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (imp_combo_box), _("Normal"));
+ gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (imp_combo_box), _("High"));
+ gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (imp_combo_box), _("Low"));
del_enabled_check = gtk_check_button_new_with_mnemonic (_("Send as Delegate"));
gtk_widget_show (del_enabled_check);

31
mail/evolution-exchange/patches/patch-eplugin_gtk-compat_h
View File

@ -1,31 +0,0 @@
$OpenBSD: patch-eplugin_gtk-compat_h,v 1.1 2011/03/07 19:41:32 ajacoutot Exp $
--- eplugin/gtk-compat.h.orig Sat Feb 26 22:54:52 2011
+++ eplugin/gtk-compat.h Sat Feb 26 22:54:52 2011
@@ -0,0 +1,27 @@
+#ifndef __GTK_COMPAT_H__
+#define __GTK_COMPAT_H__
+
+#include <gtk/gtk.h>
+
+/* Provide a GTK+ compatibility layer. */
+
+#if !GTK_CHECK_VERSION (2,23,0)
+#define gtk_combo_box_text_new gtk_combo_box_new_text
+#define gtk_combo_box_text_append_text gtk_combo_box_append_text
+#define gtk_combo_box_text_remove gtk_combo_box_remove_text
+#define gtk_combo_box_text_prepend_text gtk_combo_box_prepend_text
+#define gtk_combo_box_text_get_active_text gtk_combo_box_get_active_text
+#define GTK_COMBO_BOX_TEXT GTK_COMBO_BOX
+#define GTK_IS_COMBO_BOX_TEXT GTK_IS_COMBO_BOX
+#define GtkComboBoxText GtkComboBox
+#endif
+
+#if GTK_CHECK_VERSION (2,23,0)
+#define GTK_COMBO_BOX_ENTRY GTK_COMBO_BOX
+#define GTK_IS_COMBO_BOX_ENTRY GTK_IS_COMBO_BOX
+#else
+#define gtk_combo_box_set_entry_text_column \
+ gtk_combo_box_entry_set_text_column
+#endif
+
+#endif /* __GTK_COMPAT_H__ */

12
mail/evolution-exchange/patches/patch-m4_evo_krb5_support_m4 Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-m4_evo_krb5_support_m4,v 1.1 2011/09/12 07:26:19 ajacoutot Exp $
--- m4/evo_krb5_support.m4.orig Wed Jul 13 12:11:33 2011
+++ m4/evo_krb5_support.m4 Wed Jul 13 12:11:39 2011
@@ -27,7 +27,7 @@ AC_DEFUN([EVO_KRB5_SUPPORT],[
LIBS_save="$LIBS"
mitlibs="-lkrb5 -lk5crypto -lcom_err -lgssapi_krb5"
- heimlibs="-lkrb5 -lcrypto -lasn1 -lcom_err -lroken -lgssapi"
+ heimlibs="-lkrb5 -lcrypto -lasn1 -lcom_err -lgssapi"
sunlibs="-lkrb5 -lgss"
AC_CACHE_VAL([ac_cv_lib_kerberos5],
[

27
mail/evolution-exchange/pkg/PLIST
View File

@ -1,12 +1,22 @@
@comment $OpenBSD: PLIST,v 1.6 2010/04/27 08:21:35 ajacoutot Exp $
@comment $OpenBSD: PLIST,v 1.7 2011/09/12 07:26:19 ajacoutot Exp $
@bin bin/exchange-connector-setup-${EVO_VERSION}
@comment lib/evolution-data-server-1.2/camel-providers/libcamelexchange.la
lib/evolution-data-server-1.2/camel-providers/libcamelexchange.so
lib/evolution-data-server-1.2/camel-providers/libcamelexchange.urls
@comment lib/evolution-data-server-1.2/extensions/libebookbackendexchange.la
lib/evolution-data-server-1.2/extensions/libebookbackendexchange.so
@comment lib/evolution-data-server-1.2/extensions/libecalbackendexchange.la
lib/evolution-data-server-1.2/extensions/libecalbackendexchange.so
@comment lib/evolution-data-server/addressbook-backends/libebookbackendexchange.la
lib/evolution-data-server/addressbook-backends/libebookbackendexchange.so
@comment lib/evolution-data-server/calendar-backends/libecalbackendexchange.la
lib/evolution-data-server/calendar-backends/libecalbackendexchange.so
@comment lib/evolution-data-server/camel-providers/libcamelexchange.la
lib/evolution-data-server/camel-providers/libcamelexchange.so
lib/evolution-data-server/camel-providers/libcamelexchange.urls
lib/evolution-exchange/
lib/evolution-exchange/${EVO_VERSION}/
@comment lib/evolution-exchange/${EVO_VERSION}/libevolution-exchange-shared.la
lib/evolution-exchange/${EVO_VERSION}/libevolution-exchange-shared.so
@comment lib/evolution-exchange/${EVO_VERSION}/libexchange-storage.la
lib/evolution-exchange/${EVO_VERSION}/libexchange-storage.so
@comment lib/evolution-exchange/${EVO_VERSION}/libexchange.la
@lib lib/evolution-exchange/${EVO_VERSION}/libexchange.so.${LIBexchange_VERSION}
@comment lib/evolution-exchange/${EVO_VERSION}/libxntlm.la
@lib lib/evolution-exchange/${EVO_VERSION}/libxntlm.so.${LIBxntlm_VERSION}
@comment lib/evolution/${EVO_VERSION}/plugins/liborg-gnome-exchange-operations.la
lib/evolution/${EVO_VERSION}/plugins/liborg-gnome-exchange-operations.so
lib/evolution/${EVO_VERSION}/plugins/org-gnome-exchange-operations.eplug
@ -146,6 +156,7 @@ share/locale/ta/LC_MESSAGES/evolution-exchange-${EVO_VERSION}.mo
share/locale/te/LC_MESSAGES/evolution-exchange-${EVO_VERSION}.mo
share/locale/th/LC_MESSAGES/evolution-exchange-${EVO_VERSION}.mo
share/locale/tr/LC_MESSAGES/evolution-exchange-${EVO_VERSION}.mo
share/locale/ug/LC_MESSAGES/evolution-exchange-${EVO_VERSION}.mo
share/locale/uk/LC_MESSAGES/evolution-exchange-${EVO_VERSION}.mo
share/locale/vi/LC_MESSAGES/evolution-exchange-${EVO_VERSION}.mo
share/locale/xh/LC_MESSAGES/evolution-exchange-${EVO_VERSION}.mo

75
mail/evolution-rss/Makefile
View File

@ -1,17 +1,18 @@
# $OpenBSD: Makefile,v 1.1.1.1 2011/07/14 05:33:45 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.2 2011/09/12 07:26:19 ajacoutot Exp $
SHARED_ONLY= Yes
COMMENT= RSS-reader plugin for GNOME
COMMENT= RSS reader plugin for evolution
GNOME_PROJECT= evolution-rss
GNOME_VERSION= 0.2.90.20110422
GNOME_VERSION= 0.2.90-20110621
PKGNAME= evolution-rss-${GNOME_VERSION:S/-/./}
REVISION= 1
REVISION= 2
CATEGORIES= mail
EVO_VERSION= 2.32
EVO_VERSION= 3.0
SUBST_VARS= EVO_VERSION
HOMEPAGE= http://gnome.eu.org/evo/index.php/Evolution_RSS_Reader_Plugin
@ -25,20 +26,20 @@ PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
WANTLIB += GL ICE ORBit-2 SM X11 Xau Xcomposite Xcursor Xdamage
WANTLIB += GL ORBit-2 X11 X11-xcb Xau Xcomposite Xcursor Xdamage
WANTLIB += Xdmcp Xext Xfixes Xi Xinerama Xrandr Xrender Xxf86vm
WANTLIB += asn1 atk-1.0 c cairo camel-1.2 camel-provider-1.2 com_err
WANTLIB += crypto dbus-1 dbus-glib-1 drm ebook-1.2 edataserver-1.2
WANTLIB += edataserverui-1.2 enchant execinfo expat fontconfig
WANTLIB += freetype gailutil gcrypt gdk-x11-2.0 gdk_pixbuf-2.0
WANTLIB += gio-2.0 glib-2.0 gmodule-2.0 gnome-desktop-2 gnome-keyring
WANTLIB += gobject-2.0 gpg-error gssapi gthread-2.0 gtk-x11-2.0
WANTLIB += gtkhtml-3.14 gtkhtml-editor-3.14 krb5 m nspr4 nss3
WANTLIB += pango-1.0 pangocairo-1.0 pangoft2-1.0 pcre pixman-1
WANTLIB += plc4 plds4 png pthread pthread-stubs smime3 soup-2.4
WANTLIB += soup-gnome-2.4 sqlite3 ssl3 startup-notification-1
WANTLIB += stdc++ unique-1.0 xcb xcb-atom xcb-aux xcb-event xcb-render
WANTLIB += xcb-shm xml2 z lib/evolution/${EVO_VERSION}/eshell
WANTLIB += asn1 atk-1.0 c cairo cairo-gobject camel-1.2 camel-provider-1.2
WANTLIB += com_err crypto dbus-1 dbus-glib-1 drm ebook-1.2 edataserver-1.2
WANTLIB += edataserverui-3.0 enchant execinfo expat fontconfig
WANTLIB += freetype gailutil-3 gcrypt gdk-3 gdk_pixbuf-2.0 gio-2.0
WANTLIB += glib-2.0 gmodule-2.0 gnome-desktop-3 gnome-keyring
WANTLIB += gobject-2.0 gpg-error gssapi gthread-2.0 gtk-3 gtkhtml-4.0
WANTLIB += gtkhtml-editor-4.0 krb5 m nspr4 nss3 pango-1.0 pangocairo-1.0
WANTLIB += pangoft2-1.0 pcre pixman-1 plc4 plds4 png pthread pthread-stubs
WANTLIB += smime3 soup-2.4 soup-gnome-2.4 sqlite3 ssl3 startup-notification-1
WANTLIB += stdc++ unique-3.0 xcb xcb-aux xcb-render xcb-shm xml2
WANTLIB += z
WANTLIB += lib/evolution/${EVO_VERSION}/eshell
WANTLIB += lib/evolution/${EVO_VERSION}/eutil
MASTER_SITES= http://gnome.eu.org/
@ -49,30 +50,32 @@ MODULES= devel/gettext \
devel/gconf2
LIB_DEPENDS= devel/libsoup,-gnome \
mail/evolution
mail/evolution,-main>=3.0.2
MODGCONF2_LIBDEP= Yes
DESKTOP_FILES= Yes
MODGCONF2_SCHEMAS_DIR= evolution-rss
AUTOCONF_VERSION= 2.65
AUTOMAKE_VERSION= 1.9
CONFIGURE_STYLE= autoconf automake
CONFIGURE_ARGS+= ${CONFIGURE_SHARED} \
CONFIGURE_STYLE= gnu
CONFIGURE_ARGS= ${CONFIGURE_SHARED} \
--disable-gecko \
--disable-webkit \
--with-primary-render=gtkhtml
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
# XXX remove this chunk when updating to a 'real' release
# (current tarball created from git)
### XXX remove this chunk when updating to a 'real' release ############
MASTER_SITES= http://distfiles.bsdfrog.org/
WRKDIST= ${WRKDIR}/evolution-rss-0.2.90
BUILD_DEPENDS += x11/gnome/common \
${MODGNU_AUTOMAKE_DEPENDS} \
${MODGNU_AUTOCONF_DEPENDS}
devel/autoconf/${AUTOCONF_VERSION} \
devel/automake/${AUTOMAKE_VERSION}
USE_LIBTOOL= gnu
AUTOCONF_VERSION= 2.65
AUTOMAKE_VERSION= 1.9
CONFIGURE_STYLE= # empty
do-configure:
perl -pi -e 's,sed -i -e,perl -pi -e,g' ${WRKSRC}/src/Makefile.am
echo "\nAC_PROG_LIBTOOL" >> ${WRKSRC}/configure.ac
@ -80,10 +83,20 @@ do-configure:
AUTOCONF_VERSION=${AUTOCONF_VERSION} \
AUTOMAKE_VERSION=${AUTOMAKE_VERSION} \
CONFIGURE_ENV=${CONFIGURE_ENV} \
./autogen.sh ${CONFIGURE_ARGS} --disable-maintainer-mode
# end XXX
./autogen.sh ${CONFIGURE_ARGS} --disable-maintainer-mode \
--disable-silent-rules
### end XXX ############################################################
pre-configure:
perl -pi -e 's,sed -i -e,perl -pi -e,g' ${WRKSRC}/src/Makefile.in
# XXX the desktop file is there for "News" category integration by other
# applications -- unfortunately, setting NoDisplay= or ShowOnlyIn= will
# make applications ignore it, but we don't want evolution-import-rss to
# appear in the menu since it takes an argument which we have no way to
# give -- so add NoDisplay anyway.
post-install:
echo 'NoDisplay=true' >> \
${PREFIX}/share/applications/evolution-rss.desktop
.include <bsd.port.mk>

10
mail/evolution-rss/distinfo
View File

@ -1,5 +1,5 @@
MD5 (evolution-rss-0.2.90.20110422.tar.gz) = ohib3ndMiGvZj/rauJX4bg==
RMD160 (evolution-rss-0.2.90.20110422.tar.gz) = hplnBNHBPISYokRCGhIUqCIwT0g=
SHA1 (evolution-rss-0.2.90.20110422.tar.gz) = B+JBJg4/9h8zqsWHByUw5Q/goUg=
SHA256 (evolution-rss-0.2.90.20110422.tar.gz) = FHoI1TvwsNuL58Ew3ONfnNehfPVYYAkeM8JhTe9L2Pk=
SIZE (evolution-rss-0.2.90.20110422.tar.gz) = 2746382
MD5 (evolution-rss-0.2.90-20110621.tar.gz) = pfiS8TxC2zKbF9IkJVX0bg==
RMD160 (evolution-rss-0.2.90-20110621.tar.gz) = bsGSOybkMILcB1SRlWLGf3V6Skw=
SHA1 (evolution-rss-0.2.90-20110621.tar.gz) = FtNiDAK9JzQ3aZpxzvnz4UKhavc=
SHA256 (evolution-rss-0.2.90-20110621.tar.gz) = hEG966Gvg/vY87g3sD3cR41x9lxUEjMNg8EUwuHMOgw=
SIZE (evolution-rss-0.2.90-20110621.tar.gz) = 315860

15
mail/evolution-rss/patches/patch-src_evolution-import-rss_c Normal file
View File

@ -0,0 +1,15 @@
$OpenBSD: patch-src_evolution-import-rss_c,v 1.1 2011/09/12 07:26:19 ajacoutot Exp $
https://bugzilla.gnome.org/show_bug.cgi?id=654591
--- src/evolution-import-rss.c.orig Thu Jul 14 08:00:11 2011
+++ src/evolution-import-rss.c Thu Jul 14 08:00:17 2011
@@ -33,7 +33,7 @@
#include <gio/gio.h>
#define d(x)
-#define EVOLUTION "/opt/gnome-dev/bin/evolution&"
+#define EVOLUTION "evolution&"
#define RSS_DBUS_PATH "/org/gnome/feed/Reader"
#define RSS_DBUS_SERVICE "org.gnome.feed.Reader"

35
mail/evolution-rss/patches/patch-src_network-soup_c
View File

@ -1,35 +0,0 @@
$OpenBSD: patch-src_network-soup_c,v 1.1.1.1 2011/07/14 05:33:45 ajacoutot Exp $
Revert:
From 7d264518c2c6741e81842e7c4e6ba62f9f9a240b Mon Sep 17 00:00:00 2001
From: Lucian Langa <lucilanga@gnome.org>
Date: Fri, 28 Jan 2011 16:57:36 +0000
Subject: allow to select feed location from properties menu
--- src/network-soup.c.orig Fri Apr 22 17:16:21 2011
+++ src/network-soup.c Fri Apr 22 17:17:52 2011
@@ -800,7 +800,6 @@ net_get_unblocking(gchar *url,
/* Queue an async HTTP request */
msg = soup_message_new ("GET", url);
if (!msg) {
- if (info) g_free(info);
g_set_error(err, NET_ERROR, NET_ERROR_GENERIC, "%s",
soup_status_get_phrase(2)); //invalid url
return FALSE;
@@ -848,8 +847,6 @@ net_get_unblocking(gchar *url,
//// g_object_add_weak_pointer (G_OBJECT(msg), (gpointer)info);
g_object_weak_ref (G_OBJECT(msg), unblock_free, soup_sess);
// g_object_weak_ref (G_OBJECT(soup_sess), unblock_free, soup_sess);
- if (mainurl)
- g_free(mainurl);
return TRUE;
}
@@ -911,7 +908,6 @@ download_unblocking(
/* Queue an async HTTP request */
msg = soup_message_new ("GET", url);
if (!msg) {
- g_free(info);
g_set_error(err, NET_ERROR, NET_ERROR_GENERIC, "%s",
soup_status_get_phrase(2)); //invalid url
return FALSE;

162
mail/evolution-rss/patches/patch-src_notification_c
View File

@ -1,162 +0,0 @@
$OpenBSD: patch-src_notification_c,v 1.1.1.1 2011/07/14 05:33:45 ajacoutot Exp $
Revert:
From a5746a4876c30f7395eb21503e75ada094526183 Mon Sep 17 00:00:00 2001
From: Lucian Langa <lucilanga@gnome.org>
Date: Sat, 23 Oct 2010 06:46:00 +0000
Subject: adapt to latest EActivity changes
Revert:
From 8043acb7ff37009d9166a61f15ee0f4134b7f480 Mon Sep 17 00:00:00 2001
From: Lucian Langa <lucilanga@gnome.org>
Date: Wed, 19 Jan 2011 10:36:43 +0000
Subject: Make fetch feed operation cancelable again
--- src/notification.c.orig Fri Apr 22 16:16:03 2011
+++ src/notification.c Fri Apr 22 17:05:29 2011
@@ -23,6 +23,7 @@
#include <mail/em-utils.h>
#if (EVOLUTION_VERSION >= 22900) //kb//
#include <e-util/e-alert-dialog.h>
+#include <mail/e-mail-backend.h>
#include <shell/e-shell-taskbar.h>
#include <shell/e-shell-view.h>
#else
@@ -202,11 +203,7 @@ taskbar_pop_message(void)
}
void
-#if EVOLUTION_VERSION > 29102
-taskbar_op_abort(CamelOperation *cancellable, gpointer key)
-#else
taskbar_op_abort(gpointer key)
-#endif
{
#if EVOLUTION_VERSION < 22900 //kb//
EActivityHandler *activity_handler =
@@ -217,13 +214,9 @@ taskbar_op_abort(gpointer key)
e_activity_handler_operation_finished(
activity_handler,
activity_key);
-#else
- EActivity *activity = g_hash_table_lookup(rf->activity, key);
- e_activity_set_state (activity, E_ACTIVITY_CANCELLED);
+#endif
g_hash_table_remove(rf->activity, key);
- g_object_unref(activity);
abort_all_soup();
-#endif
}
#if EVOLUTION_VERSION >= 22900 //kb//
@@ -244,7 +237,6 @@ taskbar_op_new(gchar *message, gpointer key)
EShell *shell;
EShellBackend *shell_backend;
EActivity *activity;
- GCancellable *cancellable;
#else
EActivityHandler *activity_handler;
char *mcp;
@@ -258,13 +250,9 @@ taskbar_op_new(gchar *message, gpointer key)
#if EVOLUTION_VERSION >= 23300
activity = e_activity_new ();
-#if (EVOLUTION_VERSION >= 29102)
- e_activity_set_text (activity, message);
-#else
e_activity_set_primary_text (activity, message);
-#endif
- cancellable = camel_operation_new ();
- e_activity_set_cancellable (activity, cancellable);
+ /* does this even makes sense */
+ e_activity_set_cancellable (activity, NULL);
#else
activity = e_activity_new (message);
e_activity_set_allow_cancel (activity, TRUE);
@@ -273,10 +261,9 @@ taskbar_op_new(gchar *message, gpointer key)
e_shell_backend_add_activity (shell_backend, activity);
g_signal_connect (
- cancellable, "cancelled",
+ activity, "cancelled",
G_CALLBACK (taskbar_op_abort),
key);
- g_object_unref (cancellable);
return activity;
#else
activity_handler =
@@ -357,12 +344,7 @@ taskbar_op_finish(gchar *key)
if (activity_key) {
d("activity_key:%p\n", (gpointer)activity_key);
#if (EVOLUTION_VERSION >= 22900) //kb//
-#if (EVOLUTION_VERSION >= 29102)
- e_activity_set_state (activity_key, E_ACTIVITY_COMPLETED);
- g_object_unref(activity_key);
-#else
e_activity_complete (activity_key);
-#endif
#else
e_activity_handler_operation_finished(activity_handler, activity_key);
#endif
@@ -370,12 +352,7 @@ taskbar_op_finish(gchar *key)
}
} else {
#if (EVOLUTION_VERSION >= 22900) //kb//
-#if (EVOLUTION_VERSION >= 29102)
- e_activity_set_state (aid, E_ACTIVITY_COMPLETED);
- g_object_unref(aid);
-#else
e_activity_complete (aid);
-#endif
#else
e_activity_handler_operation_finished(activity_handler, aid);
#endif
@@ -395,12 +372,11 @@ taskbar_op_message(gchar *msg, gchar *unikey)
EActivity *activity_id;
#else
#endif
- if (!msg) {
+ if (!msg)
tmsg = g_strdup_printf(
_("Fetching Feeds (%d enabled)"),
g_hash_table_size(rf->hrname));
- unikey = (gchar *)"main";
- } else
+ else
tmsg = g_strdup(msg);
#if (EVOLUTION_VERSION >= 22900) //kb//
@@ -408,20 +384,27 @@ taskbar_op_message(gchar *msg, gchar *unikey)
activity_id =
(EActivity *)taskbar_op_new(
tmsg,
- unikey);
+ (gchar *)"main");
else
activity_id =
(EActivity *)taskbar_op_new(tmsg, msg);
#else
if (!msg)
- activity_id = taskbar_op_new(tmsg, unikey);
+ activity_id = taskbar_op_new(tmsg, (gchar *)"main");
else
activity_id = taskbar_op_new(tmsg, msg);
#endif
- g_hash_table_insert(
- rf->activity,
- GUINT_TO_POINTER(unikey),
- GUINT_TO_POINTER(activity_id));
+ if (!msg)
+ g_hash_table_insert(
+ rf->activity,
+ (gchar *)"main",
+ GUINT_TO_POINTER(activity_id));
+ else
+ if (unikey)
+ g_hash_table_insert(
+ rf->activity,
+ GUINT_TO_POINTER(unikey),
+ GUINT_TO_POINTER(activity_id));
g_free(tmsg);
return activity_id;
}

18
mail/evolution-rss/patches/patch-src_parser_c
View File

@ -1,18 +0,0 @@
$OpenBSD: patch-src_parser_c,v 1.1.1.1 2011/07/14 05:33:45 ajacoutot Exp $
Revert:
From 7d264518c2c6741e81842e7c4e6ba62f9f9a240b Mon Sep 17 00:00:00 2001
From: Lucian Langa <lucilanga@gnome.org>
Date: Fri, 28 Jan 2011 16:57:36 +0000
Subject: allow to select feed location from properties menu
--- src/parser.c.orig Fri Apr 22 17:18:39 2011
+++ src/parser.c Fri Apr 22 17:18:50 2011
@@ -83,7 +83,6 @@ rss_html_url_decode(const char *html, int len)
(xmlNodePtr)doc,
(xmlChar *)"src",
(xmlChar *)duri);
- xmlFree(url);
}
}
return src;

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

@ -1,146 +0,0 @@
$OpenBSD: patch-src_rss-config-factory_c,v 1.1.1.1 2011/07/14 05:33:45 ajacoutot Exp $
Revert:
From 7d264518c2c6741e81842e7c4e6ba62f9f9a240b Mon Sep 17 00:00:00 2001
From: Lucian Langa <lucilanga@gnome.org>
Date: Fri, 28 Jan 2011 16:57:36 +0000
Subject: allow to select feed location from properties menu
--- src/rss-config-factory.c.orig Fri Apr 22 16:16:04 2011
+++ src/rss-config-factory.c Fri Apr 22 17:13:07 2011
@@ -46,11 +46,7 @@
#include <e-util/e-alert-dialog.h>
#include <misc/e-preferences-window.h>
#include <mail/e-mail-local.h>
-#include <mail/em-folder-selector.h>
-
-#include <mail/em-utils.h>
#include <shell/e-shell.h>
-#include <shell/e-shell-view.h>
#endif
@@ -60,14 +56,12 @@
#endif
extern int rss_verbose_debug;
-extern EShellView *rss_shell_view;
#include "rss.h"
#include "misc.h"
#include "parser.h"
#include "rss-config.h"
#include "rss-config-factory.h"
-#include "rss-evo-common.h"
#include "network-soup.h"
#include "notification.h"
@@ -437,76 +431,6 @@ disable_widget_cb(GtkWidget *widget, GtkBuilder *data)
gtk_widget_set_sensitive(authpass, auth_enabled);
}
-void
-folder_cb (GtkWidget *widget, gpointer data);
-
-void
-folder_cb (GtkWidget *widget, gpointer data)
-{
- EMailBackend *backend;
- EMailSession *session;
- CamelFolderInfo *folderinfo;
- GtkWidget *folder_tree;
- GtkWidget *dialog;
- GtkWindow *window;
- const gchar *uri;
- struct _copy_folder_data *cfd;
-
- EMailReader *reader;
- EShellContent *shell_content;
-
- gchar *text = (gchar *)gtk_label_get_text(GTK_LABEL(data));
-
- shell_content = e_shell_view_get_shell_content (rss_shell_view);
- reader = E_MAIL_READER (shell_content);
- backend = e_mail_reader_get_backend (reader);
-
- session = e_mail_backend_get_session (backend);
-
- window = e_mail_reader_get_window (reader);
-
- folder_tree = em_folder_tree_new (session);
- emu_restore_folder_tree_state (EM_FOLDER_TREE (folder_tree));
-
- em_folder_tree_set_excluded (
- EM_FOLDER_TREE (folder_tree),
- EMFT_EXCLUDE_NOSELECT | EMFT_EXCLUDE_VIRTUAL |
- EMFT_EXCLUDE_VTRASH);
-
- dialog = em_folder_selector_new (
- window, EM_FOLDER_TREE (folder_tree),
- EM_FOLDER_SELECTOR_CAN_CREATE,
- _("Move to Folder"), NULL, _("M_ove"));
-
- if ((uri = lookup_uri_by_folder_name(text)))
- em_folder_selector_set_selected (
- EM_FOLDER_SELECTOR (dialog),
- uri);
-
- folderinfo = em_folder_tree_get_selected_folder_info ((EMFolderTree *)folder_tree);
-
- cfd = g_malloc (sizeof (*cfd));
- cfd->fi = folderinfo;
- cfd->delete = 1;
-
- if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_OK) {
- gchar *tmp;
- gchar *name = g_path_get_basename(text);
- uri = em_folder_selector_get_selected_uri (
- EM_FOLDER_SELECTOR (dialog));
- rss_emfu_copy_folder_selected (backend, uri, cfd);
- tmp = g_build_path(G_DIR_SEPARATOR_S,
- em_utils_folder_name_from_uri(uri),
- name, NULL);
- g_free(name);
- gtk_label_set_text(GTK_LABEL(data), tmp);
- g_free(tmp);
- }
-
- gtk_widget_destroy (dialog);
-}
-
-
add_feed *
build_dialog_add(gchar *url, gchar *feed_text)
{
@@ -618,9 +542,6 @@ build_dialog_add(gchar *url, gchar *feed_text)
location_button = GTK_WIDGET (gtk_builder_get_object(gui, "location_button"));
gtk_widget_show(location_button);
- g_signal_connect (
- GTK_BUTTON (location_button),
- "clicked", G_CALLBACK (folder_cb), entry2);
location_label = GTK_WIDGET (
gtk_builder_get_object(gui,
"location_label"));
@@ -942,8 +863,7 @@ store_redraw(GtkTreeView *data)
{
GtkTreeModel *model;
- if (!data)
- return FALSE;
+ g_return_val_if_fail(data, FALSE);
if (!store_redrawing) {
store_redrawing = 1;
@@ -1297,10 +1217,8 @@ delete_feed_folder_alloc(gchar *old_name)
feed_file = g_strdup_printf("%s/feed_folders", feed_dir);
g_free(feed_dir);
f = fopen(feed_file, "wb");
- if (!f) {
- g_free(feed_file);
+ if (!f)
return;
- }
orig_name = g_hash_table_lookup(
rf->feed_folders,

103
mail/evolution-rss/patches/patch-src_rss-evo-common_c
View File

@ -1,103 +0,0 @@
$OpenBSD: patch-src_rss-evo-common_c,v 1.1.1.1 2011/07/14 05:33:45 ajacoutot Exp $
Revert:
From 7d264518c2c6741e81842e7c4e6ba62f9f9a240b Mon Sep 17 00:00:00 2001
From: Lucian Langa <lucilanga@gnome.org>
Date: Fri, 28 Jan 2011 16:57:36 +0000
Subject: allow to select feed location from properties menu
--- src/rss-evo-common.c.orig Fri Apr 22 17:20:49 2011
+++ src/rss-evo-common.c Fri Apr 22 17:21:45 2011
@@ -64,92 +64,6 @@ struct _EProxyPrivate {
enum ProxyType type;
};
-gboolean
-rss_emfu_is_special_local_folder (const gchar *name)
-{
- return (!strcmp (name, "Drafts") || !strcmp (name, "Inbox") || !strcmp (name, "Outbox") || !strcmp (name, "Sent") || !strcmp (name, "Templates"));
-}
-
-void
-rss_emfu_copy_folder_selected (EMailBackend *backend,
- const gchar *uri,
- gpointer data)
-{
- EMailSession *session;
- struct _copy_folder_data *cfd = data;
- CamelStore *fromstore = NULL, *tostore = NULL;
- CamelStore *local_store;
- CamelService *service;
- CamelProvider *provider;
- const gchar *tobase = NULL;
- CamelURL *url;
- GError *local_error = NULL;
-
- if (uri == NULL) {
- g_free (cfd);
- return;
- }
-
- local_store = e_mail_local_get_store ();
- session = e_mail_backend_get_session (backend);
-
- fromstore = camel_session_get_store (
- CAMEL_SESSION (session), cfd->fi->uri, &local_error);
- if (fromstore == NULL) {
- e_mail_backend_submit_alert (
- backend, cfd->delete ?
- "mail:no-move-folder-notexist" :
- "mail:no-copy-folder-notexist",
- cfd->fi->full_name, uri,
- local_error->message, NULL);
- goto fail;
- }
-
- if (cfd->delete && fromstore == local_store && rss_emfu_is_special_local_folder (cfd->fi->full_name)) {
- e_mail_backend_submit_alert (
- backend, "mail:no-rename-special-folder",
- cfd->fi->full_name, NULL);
- goto fail;
- }
-
- tostore = camel_session_get_store (
- CAMEL_SESSION (session), uri, &local_error);
- if (tostore == NULL) {
- e_mail_backend_submit_alert (
- backend, cfd->delete ?
- "mail:no-move-folder-to-notexist" :
- "mail:no-copy-folder-to-notexist",
- cfd->fi->full_name, uri,
- local_error->message, NULL);
- goto fail;
- }
-
- service = CAMEL_SERVICE (tostore);
- provider = camel_service_get_provider (service);
-
- url = camel_url_new (uri, NULL);
- if (provider->url_flags & CAMEL_URL_FRAGMENT_IS_PATH)
- tobase = url->fragment;
- else if (url->path && url->path[0])
- tobase = url->path+1;
- if (tobase == NULL)
- tobase = "";
-
- em_folder_utils_copy_folders (
- fromstore, cfd->fi->full_name, tostore, tobase, cfd->delete);
-
- camel_url_free (url);
-fail:
- if (fromstore)
- g_object_unref (fromstore);
- if (tostore)
- g_object_unref (tostore);
-
- g_clear_error (&local_error);
-
- g_free (cfd);
-}
-
void
rss_ipv6_network_addr (const struct in6_addr *addr, const struct in6_addr *mask,
struct in6_addr *res)

34
mail/evolution-rss/patches/patch-src_rss-evo-common_h
View File

@ -1,34 +0,0 @@
$OpenBSD: patch-src_rss-evo-common_h,v 1.1.1.1 2011/07/14 05:33:45 ajacoutot Exp $
Revert:
From 7d264518c2c6741e81842e7c4e6ba62f9f9a240b Mon Sep 17 00:00:00 2001
From: Lucian Langa <lucilanga@gnome.org>
Date: Fri, 28 Jan 2011 16:57:36 +0000
Subject: allow to select feed location from properties menu
--- src/rss-evo-common.h.orig Fri Apr 22 17:22:14 2011
+++ src/rss-evo-common.h Fri Apr 22 17:22:41 2011
@@ -23,23 +23,10 @@
#include <camel/camel.h>
#include <libedataserver/e-proxy.h>
-struct _copy_folder_data {
- CamelFolderInfo *fi;
- gboolean delete;
-};
-
void
rss_ipv6_network_addr (const struct in6_addr *addr,
const struct in6_addr *mask,
struct in6_addr *res);
-
-gboolean
-rss_emfu_is_special_local_folder (const gchar *name);
-
-void
-rss_emfu_copy_folder_selected (EMailBackend *backend,
- const gchar *uri,
- gpointer data);
gboolean
rss_e_proxy_require_proxy_for_uri (EProxy* proxy, const gchar * uri);

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

@ -1,259 +0,0 @@
$OpenBSD: patch-src_rss_c,v 1.1.1.1 2011/07/14 05:33:45 ajacoutot Exp $
Revert:
From 7d264518c2c6741e81842e7c4e6ba62f9f9a240b Mon Sep 17 00:00:00 2001
From: Lucian Langa <lucilanga@gnome.org>
Date: Fri, 28 Jan 2011 16:57:36 +0000
Subject: allow to select feed location from properties menu
From 47391941bbfe48229a707fdd27c541ae10995cd1 Mon Sep 17 00:00:00 2001
From: Antoine Jacoutot <ajacoutot@openbsd.org>
Date: Fri, 22 Apr 2011 21:31:53 +0000
Subject: Bug 648475 - missing webkit ifdef breaks compilation
--- src/rss.c.orig Fri Apr 22 17:44:56 2011
+++ src/rss.c Mon Apr 25 08:09:34 2011
@@ -411,6 +411,7 @@ update_progress_text(gchar *title)
}
}
+#ifdef HAVE_WEBKIT
void
rss_webkit_load_string(gchar *str, gchar *base, gchar *encoding)
{
@@ -423,6 +424,7 @@ rss_webkit_load_string(gchar *str, gchar *base, gchar
if (strncmp(base, "file:///fake", 12))
webkit_set_history(base);
}
+#endif
void
update_progress_bar(guint current);
@@ -456,11 +458,15 @@ update_progress_bar(guint current)
void
browser_write(gchar *string, gint length, gchar *base)
{
- WEBKITNET *wknet;
- gchar *str = string;
guint engine = fallback_engine();
+#if defined(HAVE_GECKO) || defined (HAVE_WEBKIT)
xmlDoc *src = (xmlDoc *)parse_html(base, string, length);
gchar *encoding = (gchar *)htmlGetMetaEncoding(src);
+ gchar *str = string;
+#endif
+#ifdef HAVE_WEBKIT
+ WEBKITNET *wknet;
+#endif
switch (engine) {
case 2:
#ifdef HAVE_GECKO
@@ -504,8 +510,11 @@ void
browser_stream_write(CamelStream *stream, gchar *base)
{
GString *str = g_string_new(NULL);
- gchar *line, *encoding;
+ gchar *line;
+#ifdef HAVE_WEBKIT
+ gchar *encoding;
xmlDoc *src;
+#endif
CamelStream *in = camel_stream_buffer_new(stream, CAMEL_STREAM_BUFFER_READ);
#if (DATASERVER_VERSION >= 2033001)
@@ -518,10 +527,10 @@ browser_stream_write(CamelStream *stream, gchar *base)
g_free(tmp);
line = NULL;
}
- src = (xmlDoc *)parse_html(base, str->str, str->len);
- encoding = (gchar *)htmlGetMetaEncoding(src);
#ifdef HAVE_WEBKIT
#if (WEBKIT_VERSION >= 1001001)
+ src = (xmlDoc *)parse_html(base, str->str, str->len);
+ encoding = (gchar *)htmlGetMetaEncoding(src);
webkit_web_view_load_string(
WEBKIT_WEB_VIEW(rf->mozembed),
str->str,
@@ -943,6 +952,8 @@ rss_select_folder(gchar *folder_name)
const
#endif
gchar *uri;
+ CamelStore *store;
+ CamelFolder *fold = NULL;
EShellSidebar *shell_sidebar;
d("rss_select_folder() %s:%d\n", __FILE__, __LINE__);
@@ -951,12 +962,23 @@ rss_select_folder(gchar *folder_name)
shell_sidebar = e_shell_view_get_shell_sidebar(rss_shell_view);
g_object_get (shell_sidebar, "folder-tree", &folder_tree, NULL);
+ store = rss_component_peek_local_store();
+#if (DATASERVER_VERSION >= 2033001)
+ fold = camel_store_get_folder_sync (store, folder_name, 0, NULL, NULL);
+#else
+ fold = camel_store_get_folder (store, folder_name, 0, NULL);
+#endif
+ if (!fold) return;
+#if EVOLUTION_VERSION >= 29101
+ uri = camel_folder_get_uri (fold);
+#else
+ uri = mail_tools_folder_to_url (fold);
+#endif
- uri = lookup_uri_by_folder_name(folder_name);
em_folder_tree_set_selected(folder_tree, uri, 0);
#endif
#if EVOLUTION_VERSION < 29101
- if (uri) g_free(uri);
+ g_free(uri);
#endif
}
@@ -976,9 +998,10 @@ summary_cb (GtkWidget *button, EMFormatHTMLPObject *po
static void
back_cb (GtkWidget *button, EMFormatHTMLPObject *pobject)
{
- guint engine;
- engine = fallback_engine();
-#ifdef HAVE_GECKO
+#if defined(HAVE_GECKO) || defined(HAVE_WEBKIT)
+ guint engine = fallback_engine();
+#endif
+#ifdef HAVE_GECKO
if (engine == 2)
gtk_moz_embed_go_back((GtkMozEmbed *)rf->mozembed);
#endif
@@ -992,8 +1015,9 @@ back_cb (GtkWidget *button, EMFormatHTMLPObject *pobje
static void
forward_cb (GtkWidget *button, EMFormatHTMLPObject *pobject)
{
- guint engine;
- engine = fallback_engine();
+#if defined(HAVE_GECKO) || defined(HAVE_WEBKIT)
+ guint engine = fallback_engine();
+#endif
#ifdef HAVE_GECKO
if (engine == 2)
gtk_moz_embed_go_forward((GtkMozEmbed *)rf->mozembed);
@@ -1009,8 +1033,9 @@ void stop_cb (GtkWidget *button, EMFormatHTMLPObject *
void
stop_cb (GtkWidget *button, EMFormatHTMLPObject *pobject)
{
- guint engine;
- engine = fallback_engine();
+#if defined(HAVE_GECKO) || defined(HAVE_WEBKIT)
+ guint engine = fallback_engine();
+#endif
#ifdef HAVE_GECKO
if (engine == 2)
gtk_moz_embed_stop_load((GtkMozEmbed *)rf->mozembed);
@@ -2124,7 +2149,6 @@ void org_gnome_cooly_format_rss(void *ep, EMFormatHook
gchar *comments = NULL;
gchar *category = NULL;
GdkPixbuf *pixbuf = NULL;
- guint engine = 0;
int size;
CamelDataWrapper *dw = camel_data_wrapper_new();
CamelMimePart *part = camel_mime_part_new();
@@ -2247,8 +2271,8 @@ void org_gnome_cooly_format_rss(void *ep, EMFormatHook
if (rf->cur_format || (feedid && is_html && rf->cur_format)) {
- engine = fallback_engine();
#ifdef HAVE_RENDERKIT
+ guint engine = fallback_engine();
if (engine && engine != 10) {
char *classid = g_strdup_printf(
"org-gnome-rss-controls-%d",
@@ -2269,11 +2293,6 @@ void org_gnome_cooly_format_rss(void *ep, EMFormatHook
pobj->stopbut = button2;
pobj->backbut = button3;
pobj->forwbut = button4;
-// camel_stream_printf (t->stream,
-// "<div style=\"border: solid #%06x 1px; background-color: #%06x; color: #%06x;\">\n",
-// frame_colour & 0xffffff,
-// content_colour & 0xffffff,
-// text_colour & 0xffffff);
camel_stream_printf(t->stream,
"<table style=\"border: solid #%06x 1px; background-color: #%06x; color: #%06x;\" cellpadding=1 cellspacing=0><tr><td align=center>",
frame_colour & 0xffffff,
@@ -3762,7 +3781,6 @@ print_comments(gchar *url, gchar *stream, EMFormatHTML
return display_comments (r, format);
}
- g_free(r);
return NULL;
}
@@ -3942,30 +3960,6 @@ lookup_chn_name_by_url(gchar *url)
return chn_name;
}
-gchar *
-lookup_uri_by_folder_name(gchar *name)
-{
- CamelFolder *folder;
- gchar *uri;
- CamelStore *store = rss_component_peek_local_store();
-
- if (!name)
- return NULL;
-
-#if (DATASERVER_VERSION >= 2033001)
- folder = camel_store_get_folder_sync (store, name, 0, NULL, NULL);
-#else
- folder = camel_store_get_folder (store, name, 0, NULL);
-#endif
- if (!folder) return NULL;
-#if EVOLUTION_VERSION >= 29101
- uri = (gchar *)camel_folder_get_uri (folder);
-#else
- uri = mail_tools_folder_to_url (folder);
-#endif
- return uri;
-}
-
void
update_main_folder(gchar *new_name)
{
@@ -4029,7 +4023,6 @@ search_rebase(gpointer key, gpointer value, gchar *ona
if (!strncmp(key, tmp, strlen(tmp))) {
rebase_keys = g_list_append(rebase_keys, key);
}
- g_free(tmp);
}
void
@@ -4066,7 +4059,7 @@ sync_folders(void)
g_free(feed_dir);
f = fopen(feed_file, "wb");
if (!f)
- goto out;
+ return;
if (!g_hash_table_size(rf->feed_folders))
goto exit;
@@ -4074,6 +4067,7 @@ sync_folders(void)
g_hash_table_foreach(rf->feed_folders,
(GHFunc)write_feeds_folder_line,
(gpointer *)f);
+ g_free(feed_file);
g_hash_table_destroy(rf->reversed_feed_folders);
rf->reversed_feed_folders = g_hash_table_new_full(g_str_hash,
g_str_equal,
@@ -4083,7 +4077,6 @@ sync_folders(void)
(GHFunc)populate_reversed,
rf->reversed_feed_folders);
exit: fclose(f);
-out: g_free(feed_file);
return;
}
@@ -4862,7 +4855,7 @@ e_plugin_ui_init (GtkUIManager *ui_manager,
rss_shell_view = shell_view;
shell_window = e_shell_view_get_shell_window (rss_shell_view);
- evo_window = (GtkWidget *)shell_window;
+ evo_window = shell_window;
g_signal_connect (
e_shell_window_get_action (
E_SHELL_WINDOW (shell_window),

29
mail/evolution-rss/patches/patch-src_rss_h
View File

@ -1,29 +0,0 @@
$OpenBSD: patch-src_rss_h,v 1.1.1.1 2011/07/14 05:33:45 ajacoutot Exp $
Revert:
From 7d264518c2c6741e81842e7c4e6ba62f9f9a240b Mon Sep 17 00:00:00 2001
From: Lucian Langa <lucilanga@gnome.org>
Date: Fri, 28 Jan 2011 16:57:36 +0000
Subject: allow to select feed location from properties menu
--- src/rss.h.orig Fri Apr 22 17:28:35 2011
+++ src/rss.h Fri Apr 22 17:29:11 2011
@@ -404,17 +404,14 @@ void rss_error(
gchar *emsg);
void rss_hooks_init(void);
void rss_select_folder(gchar *folder_name);
-gboolean update_articles(gboolean disabler);
-
gchar *lookup_chn_name_by_url(gchar *url);
+gboolean update_articles(gboolean disabler);
gchar *lookup_main_folder(void);
gchar *lookup_feed_folder(gchar *folder);
gchar *lookup_feed_folder_raw(gchar *folder);
gchar *lookup_original_folder(
gchar *folder,
gboolean *found);
-gchar *lookup_uri_by_folder_name(gchar *name);
-
gchar *decode_utf8_entities(gchar *str);
gchar *decode_html_entities(gchar *str);
gchar *get_real_channel_name(gchar *uri, gchar *failed);

3
mail/evolution-rss/pkg/DESCR
View File

@ -1,2 +1 @@
This plugin adds RSS Feeds support for evolution mail.
Evolution RSS can display articles using summary view or HTML view.
This is an evolution plugin which enables evolution to read rss feeds.

5
mail/evolution-rss/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2011/07/14 05:33:45 ajacoutot Exp $
@comment $OpenBSD: PLIST,v 1.2 2011/09/12 07:26:19 ajacoutot Exp $
@pkgpath mail/evolution-plugin-rss
@bin bin/evolution-import-rss
@comment lib/evolution/${EVO_VERSION}/plugins/liborg-gnome-evolution-rss.a
@ -6,6 +6,7 @@
lib/evolution/${EVO_VERSION}/plugins/liborg-gnome-evolution-rss.so
lib/evolution/${EVO_VERSION}/plugins/org-gnome-evolution-rss.eplug
lib/evolution/${EVO_VERSION}/plugins/org-gnome-evolution-rss.xml
share/applications/evolution-rss.desktop
share/evolution/${EVO_VERSION}/errors/org-gnome-evolution-rss.error
share/evolution/${EVO_VERSION}/images/pix.png
share/evolution/${EVO_VERSION}/images/rss-16.png
@ -55,3 +56,5 @@ share/locale/zh_CN/LC_MESSAGES/evolution-rss.mo
${SCHEMAS_INSTDIR}/
${SCHEMAS_INSTDIR}/evolution-rss.schemas
@exec GCONF_CONFIG_SOURCE=`%D/bin/gconftool-2 --get-default-source` %D/bin/gconftool-2 --makefile-install-rule %D/${SCHEMAS_INSTDIR}/*.schemas > /dev/null
@exec %D/bin/update-desktop-database
@unexec-delete %D/bin/update-desktop-database

126
mail/evolution/Makefile
View File

@ -1,16 +1,16 @@
# $OpenBSD: Makefile,v 1.125 2011/07/03 17:14:23 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.126 2011/09/12 07:26:19 ajacoutot Exp $
COMMENT-main= integrated email and PIM software for GNOME
COMMENT-plugins= additionnal plugins for evolution
GNOME_PROJECT= evolution
GNOME_VERSION= 2.32.3
GNOME_VERSION= 3.0.3
EXTRACT_SUFX= .tar.xz
PKGNAME-main= ${DISTNAME}
PKGNAME-plugins= evolution-plugins-${GNOME_VERSION}
REVISION-main= 0
# Only get the first x.y which is needed in the PLIST.
# NOTE: when major version changes, increment EVO_VERSION accordingly
# and bump:
@ -30,7 +30,7 @@ MAINTAINER= Jasper Lievisse Adriaanse <jasper@openbsd.org>, \
SO_VERSION= 6.0
.for _lib in \
art_lgpl gnomecanvas eutil evolution-a11y filter emiscwidgets etext \
gnomecanvas eutil evolution-a11y filter emiscwidgets etext \
etimezonedialog etable menus eshell essmime evolution-smime emformat \
eabutil evolution-addressbook-importers econtacteditor \
econtactlisteditor composer evolution-mail evolution-mail-importers \
@ -38,44 +38,49 @@ evolution-calendar evolution-mail-settings evolution-calendar-importers
SHARED_LIBS+= ${_lib} ${SO_VERSION}
.endfor
# LGPLv2+
# # GPLv2+ - LGPLv2+ - OpenLDAP license - GFDL 1.1
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
WANTLIB += ICE ORBit-2 SM X11 Xau Xcomposite Xcursor Xdamage Xdmcp
WANTLIB += Xext Xfixes Xi Xinerama Xrandr Xrender asn1
WANTLIB += atk-1.0 c cairo com_err crypto dbus-1 dbus-glib-1
WANTLIB += enchant execinfo expat fontconfig freetype
WANTLIB += gailutil gcrypt gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0
WANTLIB += glib-2.0 gmodule-2.0 gnome-keyring canberra
WANTLIB += gobject-2.0 gpg-error gssapi gthread-2.0 gtk-x11-2.0
WANTLIB += ical krb5 m nspr4 pango-1.0 camel-1.2 camel-provider-1.2
WANTLIB += pangocairo-1.0 pangoft2-1.0 pcre pixman-1 plc4 plds4
WANTLIB += png pthread pthread-stubs sqlite3 startup-notification-1
WANTLIB += stdc++ xcb xcb-atom xcb-aux xcb-event xcb-render
WANTLIB += xml2 z gtkhtml-3.14 gtkhtml-editor-3.14
WANTLIB += gdata soup-gnome-2.4 gdata ebook-1.2
WANTLIB += ecal-1.2 edataserver-1.2 edataserverui-1.2 unique-1.0
WANTLIB += gnome-desktop-2 nss3 smime3 ssl3 notify soup-2.4
WANTLIB += GL Xxf86vm db drm ebackend-1.2 egroupwise-1.2
WANTLIB += icalss icalvcal nssutil3 softokn3 xcb-shm
WANTLIB += GL ICE ORBit-2 SM X11 X11-xcb Xau Xcomposite Xcursor
WANTLIB += Xdamage Xdmcp Xext Xfixes Xi Xinerama Xrandr Xrender
WANTLIB += Xxf86vm asn1 atk-1.0 c cairo cairo-gobject camel-1.2
WANTLIB += camel-provider-1.2 canberra com_err crypto
WANTLIB += db dbus-1 dbus-glib-1 drm ebackend-1.2 ebook-1.2 ecal-1.2
WANTLIB += edataserver-1.2 edataserverui-3.0 egroupwise-1.2 enchant
WANTLIB += execinfo expat fontconfig freetype gailutil-3
WANTLIB += gcrypt gdk-3 gdk_pixbuf-2.0 gio-2.0 glib-2.0
WANTLIB += gmodule-2.0 gnome-desktop-3 gnome-keyring gobject-2.0
WANTLIB += gpg-error gssapi gthread-2.0 gtk-3 gtkhtml-4.0 gtkhtml-editor-4.0
WANTLIB += ical icalss icalvcal krb5
WANTLIB += m notify nspr4 nss3 nssutil3 pango-1.0 pangocairo-1.0
WANTLIB += pangoft2-1.0 pcre pixman-1 plc4 plds4 png pthread
WANTLIB += pthread-stubs smime3 softokn3 soup-2.4 sqlite3 ssl3
WANTLIB += startup-notification-1 stdc++ unique-3.0
WANTLIB += xcb xcb-aux xcb-render xcb-shm xml2 z
WANTLIB-main += ${WANTLIB} vorbisfile canberra-gtk
WANTLIB-main += gweather icalss icalvcal ogg db gtkimageview
WANTLIB-main += icalss icalvcal ldap-2.4 ltdl ogg pst softokn3
WANTLIB-main += ebackend-1.2 egroupwise-1.2 vorbis
WANTLIB-main += ltdl ogg vorbis vorbisfile
WANTLIB-main += ${WANTLIB}
WANTLIB-main += canberra-gtk3 gdata gweather-3 ldap-2.4 ltdl ogg pst
WANTLIB-main += vorbis vorbisfile
WANTLIB-plugins += ${WANTLIB} gstreamer-0.10
WANTLIB-plugins += lib/evolution/${R}/composer lib/evolution/${R}/emformat
WANTLIB-plugins += lib/evolution/${R}/eshell lib/evolution/${R}/evolution-calendar
WANTLIB-plugins += lib/evolution/${R}/evolution-mail lib/evolution/${R}/emiscwidgets
WANTLIB-plugins += lib/evolution/${R}/eutil lib/evolution/${R}/art_lgpl
WANTLIB-plugins += lib/evolution/${R}/etable lib/evolution/${R}/etext
WANTLIB-plugins += lib/evolution/${R}/evolution-a11y lib/evolution/${R}/menus
WANTLIB-plugins += lib/evolution/${R}/filter lib/evolution/${R}/gnomecanvas
WANTLIB-plugins += ${WANTLIB}
WANTLIB-plugins += gstreamer-0.10
WANTLIB-plugins += lib/evolution/${R}/eabutil
WANTLIB-plugins += lib/evolution/${R}/composer
WANTLIB-plugins += lib/evolution/${R}/emformat
WANTLIB-plugins += lib/evolution/${R}/emiscwidgets
WANTLIB-plugins += lib/evolution/${R}/eshell
WANTLIB-plugins += lib/evolution/${R}/etable
WANTLIB-plugins += lib/evolution/${R}/etext
WANTLIB-plugins += lib/evolution/${R}/eutil
WANTLIB-plugins += lib/evolution/${R}/evolution-a11y
WANTLIB-plugins += lib/evolution/${R}/evolution-calendar
WANTLIB-plugins += lib/evolution/${R}/evolution-mail
WANTLIB-plugins += lib/evolution/${R}/filter
WANTLIB-plugins += lib/evolution/${R}/gnomecanvas
WANTLIB-plugins += lib/evolution/${R}/menus
MULTI_PACKAGES= -main -plugins
@ -92,23 +97,22 @@ RUN_DEPENDS-main= ${RUN_DEPENDS} \
x11/hicolor-icon-theme \
x11/gnome/icon-theme
LIB_DEPENDS-main= ${LIB_DEPENDS} \
devel/libunique \
devel/libunique3 \
converters/libpst \
databases/evolution-data-server>=2.32.2 \
databases/openldap \
devel/libnotify>=0.7.2 \
devel/libsoup \
graphics/gtkimageview \
security/nss \
x11/gnome/desktop \
www/gtkhtml3 \
audio/libcanberra,-gtk
www/gtkhtml4 \
audio/libcanberra,-gtk3
LIB_DEPENDS-plugins= ${LIB_DEPENDS} \
multimedia/gstreamer-0.10/core \
mail/evolution,-main>=${GNOME_VERSION}
mail/evolution,-main>=${GNOME_VERSION} \
multimedia/gstreamer-0.10/core
# needed for the audio-inline plugin
RUN_DEPENDS-plugins= multimedia/gstreamer-0.10/plugins-good
RUN_DEPENDS-plugins= ${MODGCONF2_RUN_DEPENDS} \
multimedia/gstreamer-0.10/plugins-good
MODGNOME_HELP_FILES= Yes
DESKTOP_FILES= Yes
@ -116,37 +120,37 @@ MODGCONF2_SCHEMAS_DIR= evolution
YACC= bison
CONFIGURE_STYLE= gnu
AUTOCONF_VERSION= 2.68
AUTOMAKE_VERSION= 1.9
CONFIGURE_STYLE= autoconf
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include \
-DBOGOFILTER_BINARY="\\\"${LOCALBASE}/bin/bogofilter\\\""" \
LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}lib \
-Wl,-rpath,${TRUEPREFIX}/lib/evolution/${R}:${TRUEPREFIX}/lib \
-Wl,--as-needed"
CONFIGURE_ARGS+= ${CONFIGURE_SHARED} \
--disable-gtk-doc \
--enable-nss=yes \
--enable-smime=yes \
--enable-plugins=all \
--disable-mono \
--disable-nm \
--with-openldap="${LOCALBASE}" \
--with-sub-version=" OpenBSD/Ports" \
--with-krb5=/usr \
--with-krb5-includes=/usr/include/kerberosV \
--disable-nm \
--disable-python
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib \
-Wl,-rpath,${TRUEPREFIX}/lib/evolution/${R}:${TRUEPREFIX}/lib \
-Wl,--as-needed" \
PTHREAD_LIB="-pthread"
--with-krb5-includes=/usr/include/kerberosV
# no gtkimageview release for gtk+3
CONFIGURE_ARGS+= --disable-image-inline
FAKE_FLAGS= autostartdir=${PREFIX}/share/examples/evolution/xdg/autostart
pre-configure:
${SUBST_CMD} ${WRKSRC}/plugins/bogo-junk-plugin/bf-junk-filter.c \
${WRKSRC}/plugins/sa-junk-plugin/em-junk-filter.c
# needed to prevent lazy bindings failures on pthreads(3) functions
post-configure:
perl -pi -e 's|-Wl,--as-needed||g' \
${WRKBUILD}/{shell,calendar/gui/alarm-notify,plugins/backup-restore}/Makefile
${WRKBUILD}/{shell,calendar/gui/alarm-notify,plugins/backup-restore,capplet,capplet/settings}/Makefile
post-install:
find ${PREFIX}/share/evolution/${R}/default -perm 444 -exec chmod 644 {} \;
# originally designed for MeeGo (https://bugzilla.gnome.org/show_bug.cgi?id=654525)
rm ${PREFIX}/share/applications/evolution-settings.desktop
.include <bsd.port.mk>

10
mail/evolution/distinfo
View File

@ -1,5 +1,5 @@
MD5 (evolution-2.32.3.tar.bz2) = rWj/wSxxU7SnzbBmUhrweg==
RMD160 (evolution-2.32.3.tar.bz2) = G2TQCjjPitXCc8xPSu5zEk/oGK8=
SHA1 (evolution-2.32.3.tar.bz2) = zCohJu9Bkhk9zlDEPFu2/ApX/N4=
SHA256 (evolution-2.32.3.tar.bz2) = M6s4eA6au3FQYjDjMenDU0REte0/FwRvC2NxoA32hvs=
SIZE (evolution-2.32.3.tar.bz2) = 31966138
MD5 (evolution-3.0.3.tar.xz) = PQ/W7p0g1TrYEGJcOFry1Q==
RMD160 (evolution-3.0.3.tar.xz) = DPBFesRlTid8/w4XTSnMPcluCSQ=
SHA1 (evolution-3.0.3.tar.xz) = wOqKhVHhk39e3mZdCjT/jqdz2Dk=
SHA256 (evolution-3.0.3.tar.xz) = N/rc1Fm3SWD8z4BfYn/4aeMVNnaQr4gJzpVux+IylPc=
SIZE (evolution-3.0.3.tar.xz) = 25755880

16
mail/evolution/patches/patch-calendar_gui_alarm-notify_alarm-queue_c
View File

@ -1,16 +0,0 @@
$OpenBSD: patch-calendar_gui_alarm-notify_alarm-queue_c,v 1.1 2011/04/21 07:05:36 ajacoutot Exp $
Fix with libnotify>=0.7
(notify_notification_new has lost its widget argument)
--- calendar/gui/alarm-notify/alarm-queue.c.orig Tue Apr 19 11:03:11 2011
+++ calendar/gui/alarm-notify/alarm-queue.c Tue Apr 19 11:03:19 2011
@@ -1606,7 +1606,7 @@ popup_notification (time_t trigger, CompQueuedAlarms *
body = g_strdup_printf ("%s %s", start_str, time_str);
}
- n = notify_notification_new (summary, body, "stock_appointment-reminder", NULL);
+ n = notify_notification_new (summary, body, "stock_appointment-reminder");
if (!notify_notification_show(n, NULL))
g_warning ("Could not send notification to daemon\n");

42
mail/evolution/patches/patch-configure
View File

@ -1,42 +0,0 @@
$OpenBSD: patch-configure,v 1.19 2011/03/07 19:36:17 ajacoutot Exp $
XXX remove -DGTK_DISABLE_DEPRECATED to fix build with gtk>=2.24
--- configure.orig Sun Feb 6 05:36:30 2011
+++ configure Sat Feb 26 21:38:23 2011
@@ -4344,7 +4344,6 @@ fi
list="-DG_DISABLE_DEPRECATED
-DPANGO_DISABLE_DEPRECATED
-DGDK_PIXBUF_DISABLE_DEPRECATED
- -DGTK_DISABLE_DEPRECATED
-DEDS_DISABLE_DEPRECATED
-DG_DISABLE_SINGLE_INCLUDES
-DGTK_DISABLE_SINGLE_INCLUDES
@@ -4405,8 +4404,6 @@ $as_echo "$as_me: WARNING: unsupported compiler flags:
AM_CPPFLAGS="$WARNING_FLAGS -fno-strict-aliasing"
-LDFLAGS="$LDFLAGS -Wl,--no-undefined"
-
# Make sure we can run config.sub.
$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
@@ -16019,9 +16016,6 @@ LIBS=$ac_check_lib_save_LIBS
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_resolv_res_query" >&5
$as_echo "$ac_cv_lib_resolv_res_query" >&6; }
-if test "x$ac_cv_lib_resolv_res_query" = x""yes; then :
- LDAP_LIBS="-lresolv"
-fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for bind in -lsocket" >&5
$as_echo_n "checking for bind in -lsocket... " >&6; }
@@ -16824,7 +16818,7 @@ $as_echo_n "checking for Kerberos 5... " >&6; }
LIBS_save="$LIBS"
mitlibs="-lkrb5 -lk5crypto -lcom_err -lgssapi_krb5"
- heimlibs="-lkrb5 -lcrypto -lasn1 -lcom_err -lroken -lgssapi"
+ heimlibs="-lkrb5 -lcrypto -lasn1 -lcom_err -lgssapi"
sunlibs="-lkrb5 -lgss"
if test "${ac_cv_lib_kerberos5+set}" = set; then :
$as_echo_n "(cached) " >&6

45
mail/evolution/patches/patch-configure_ac Normal file
View File

@ -0,0 +1,45 @@
$OpenBSD: patch-configure_ac,v 1.1 2011/09/12 07:26:19 ajacoutot Exp $
From 1f002e02aaa2bcd0f8128937940b025cf13b0828 Mon Sep 17 00:00:00 2001
From: Antoine Jacoutot <ajacoutot@openbsd.org>
Date: Tue, 12 Jul 2011 21:28:14 +0000
Subject: Fix OpenBSD/FreeBSD support
--- configure.ac.orig Mon Apr 25 09:02:53 2011
+++ configure.ac Wed Jul 13 04:21:18 2011
@@ -99,6 +99,10 @@ dnl -DE_CAL_DISABLE_DEPRECATED
AM_CPPFLAGS="$WARNING_FLAGS -fno-strict-aliasing"
AC_SUBST(AM_CPPFLAGS)
+AC_CANONICAL_HOST
+AC_DEFINE_UNQUOTED(VERSION_COMMENT, "", [Define if you want a comment appended to the version number])
+
+dnl This must stay after AC_CANONICAL_HOST, which defines $host.
case "$host" in
*openbsd*|*freebsd*)
dnl Do not set '-Wl,--no-undefined' on freebsd/openbsd
@@ -108,8 +112,6 @@ case "$host" in
;;
esac
-AC_CANONICAL_HOST
-AC_DEFINE_UNQUOTED(VERSION_COMMENT, "", [Define if you want a comment appended to the version number])
dnl *************************************
dnl Put the ACLOCAL flags in the Makefile
@@ -200,6 +202,15 @@ case "$host" in
SOFTOKN3_LIB=''
CHAMPLAIN_REQUIREMENT=''
GEOCLUE_REQUIREMENT=''
+ ;;
+*openbsd*|*freebsd*)
+ os_win32=no
+ NO_UNDEFINED=''
+ SOEXT='.so'
+ SA_JUNK_PLUGIN=sa-junk-plugin
+ BF_JUNK_PLUGIN=bogo-junk-plugin
+ DL_LIB=''
+ SOFTOKN3_LIB='-lsoftokn3'
;;
*)
os_win32=no

18
mail/evolution/patches/patch-e-util_e-logger_c
View File

@ -1,18 +0,0 @@
$OpenBSD: patch-e-util_e-logger_c,v 1.2 2011/07/03 17:14:24 ajacoutot Exp $
e-logger.c:220: warning: format '%ld' expects type 'long int', but argument 4 has type 'time_t'
e-logger.c:221: warning: format '%ld' expects type 'long int', but argument 4 has type 'time_t'
--- e-util/e-logger.c.orig Fri Apr 15 22:30:17 2011
+++ e-util/e-logger.c Fri Apr 15 22:30:33 2011
@@ -217,8 +217,8 @@ e_logger_log (ELogger *logger,
if (!logger->priv->fp)
return;
- fprintf (logger->priv->fp, "%d:%ld:%s\n", level, t, primary);
- fprintf (logger->priv->fp, "%d:%ld:%s\n", level, t, secondary);
+ fprintf (logger->priv->fp, "%d:%ld:%s\n", level, (long int)t, primary);
+ fprintf (logger->priv->fp, "%d:%ld:%s\n", level, (long int)t, secondary);
logger_set_dirty (logger);
}

12
mail/evolution/patches/patch-m4_evo_krb5_support_m4 Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-m4_evo_krb5_support_m4,v 1.3 2011/09/12 07:26:19 ajacoutot Exp $
--- m4/evo_krb5_support.m4.orig Tue Jul 12 11:30:13 2011
+++ m4/evo_krb5_support.m4 Tue Jul 12 11:30:19 2011
@@ -27,7 +27,7 @@ AC_DEFUN([EVO_KRB5_SUPPORT],[
LIBS_save="$LIBS"
mitlibs="-lkrb5 -lk5crypto -lcom_err -lgssapi_krb5"
- heimlibs="-lkrb5 -lcrypto -lasn1 -lcom_err -lroken -lgssapi"
+ heimlibs="-lkrb5 -lcrypto -lasn1 -lcom_err -lgssapi"
sunlibs="-lkrb5 -lgss"
AC_CACHE_VAL([ac_cv_lib_kerberos5],
[

2
mail/evolution/patches/patch-mail_em-utils_h
View File

@ -1,4 +1,4 @@
$OpenBSD: patch-mail_em-utils_h,v 1.4 2010/09/30 08:01:26 ajacoutot Exp $
$OpenBSD: patch-mail_em-utils_h,v 1.5 2011/09/12 07:26:19 ajacoutot Exp $
--- mail/em-utils.h.orig Mon Sep 13 14:18:10 2010
+++ mail/em-utils.h Wed Sep 29 19:21:20 2010
@@ -23,8 +23,8 @@

27
mail/evolution/patches/patch-modules_calendar_e-cal-attachment-handler_c
View File

@ -1,27 +0,0 @@
$OpenBSD: patch-modules_calendar_e-cal-attachment-handler_c,v 1.1 2011/03/07 19:36:17 ajacoutot Exp $
Bug 608804 - Some attachments make evolution crash in libical
--- modules/calendar/e-cal-attachment-handler.c.orig Thu Oct 14 23:18:37 2010
+++ modules/calendar/e-cal-attachment-handler.c Tue Feb 22 14:09:24 2011
@@ -83,7 +83,19 @@ attachment_handler_get_component (EAttachment *attachm
camel_data_wrapper_decode_to_stream (wrapper, stream, NULL);
g_object_unref (stream);
- component = e_cal_util_parse_ics_string ((gchar *) buffer->data);
+ if (buffer->len > 0) {
+ const gchar *str;
+
+ /* ensure string being null-terminated */
+ g_byte_array_append (buffer, (const guint8 *) "", 1);
+
+ str = (const gchar *) buffer->data;
+ while (*str && g_ascii_isspace (*str))
+ str++;
+
+ if (g_ascii_strncasecmp (str, "BEGIN:", 6) == 0)
+ component = e_cal_util_parse_ics_string (str);
+ }
g_byte_array_free (buffer, TRUE);

12
mail/evolution/patches/patch-plugins_bogo-junk-plugin_bf-junk-filter_c
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-plugins_bogo-junk-plugin_bf-junk-filter_c,v 1.3 2010/09/30 08:01:26 ajacoutot Exp $
--- plugins/bogo-junk-plugin/bf-junk-filter.c.orig Mon Sep 13 14:18:11 2010
+++ plugins/bogo-junk-plugin/bf-junk-filter.c Wed Sep 29 19:20:37 2010
@@ -49,7 +49,7 @@
#include "shell/e-shell.h"
#ifndef BOGOFILTER_BINARY
-#define BOGOFILTER_BINARY "/usr/bin/bogofilter"
+#define BOGOFILTER_BINARY "${LOCALBASE}/bin/bogofilter"
#endif
#define BOGOFILTER_ERROR 3

21
mail/evolution/patches/patch-plugins_mail-notification_mail-notification_c
View File

@ -1,21 +0,0 @@
$OpenBSD: patch-plugins_mail-notification_mail-notification_c,v 1.1 2011/04/21 07:05:36 ajacoutot Exp $
Fix with libnotify>=0.7
(notify_notification_new has lost its widget argument)
(notify_notification_attach_to_status_icon is gone)
--- plugins/mail-notification/mail-notification.c.orig Thu Oct 14 23:18:38 2010
+++ plugins/mail-notification/mail-notification.c Tue Apr 19 11:53:23 2011
@@ -564,9 +564,9 @@ new_notify_status (EMEventTargetFolder *t)
notify = notify_notification_new (
_("New email"), safetext,
- "mail-unread", NULL);
- notify_notification_attach_to_status_icon (
- notify, status_icon);
+ "mail-unread");
+// notify_notification_attach_to_status_icon (
+// notify, status_icon);
/* Check if actions are supported */
if (can_support_actions ()) {

20
mail/evolution/patches/patch-plugins_publish-calendar_publish-calendar_c
View File

@ -1,20 +0,0 @@
$OpenBSD: patch-plugins_publish-calendar_publish-calendar_c,v 1.1 2011/04/21 07:05:36 ajacoutot Exp $
Fix with libnotify>=0.7
(notify_notification_new has lost its widget argument)
(notify_notification_attach_to_status_icon is gone)
--- plugins/publish-calendar/publish-calendar.c.orig Mon Sep 13 14:18:11 2010
+++ plugins/publish-calendar/publish-calendar.c Tue Apr 19 11:54:29 2011
@@ -150,8 +150,8 @@ update_publish_notification (GtkMessageType msg_type,
return;
}
- notify = notify_notification_new (_("Calendar Publishing"), actual_msg->str, stock_name, NULL);
- notify_notification_attach_to_status_icon (notify, status_icon);
+ notify = notify_notification_new (_("Calendar Publishing"), actual_msg->str, stock_name);
+// notify_notification_attach_to_status_icon (notify, status_icon);
notify_notification_set_urgency (notify, NOTIFY_URGENCY_NORMAL);
notify_notification_set_timeout (notify, NOTIFY_EXPIRES_DEFAULT);
g_timeout_add (500, show_notify_cb, NULL);

14
mail/evolution/patches/patch-plugins_sa-junk-plugin_em-junk-filter_c
View File

@ -1,14 +0,0 @@
$OpenBSD: patch-plugins_sa-junk-plugin_em-junk-filter_c,v 1.4 2010/09/30 08:01:26 ajacoutot Exp $
--- plugins/sa-junk-plugin/em-junk-filter.c.orig Mon Sep 13 14:18:11 2010
+++ plugins/sa-junk-plugin/em-junk-filter.c Wed Sep 29 19:20:37 2010
@@ -82,8 +82,8 @@ static volatile gboolean em_junk_sa_local_only;
static volatile gboolean em_junk_sa_use_daemon;
static gchar * em_junk_sa_preferred_socket_path;
-static const gchar *em_junk_sa_spamc_binaries [4] = {"spamc", "/usr/bin/spamc", "/usr/sbin/spamc", NULL};
-static const gchar *em_junk_sa_spamd_binaries [4] = {"spamd", "/usr/bin/spamd", "/usr/sbin/spamd", NULL};
+static const gchar *em_junk_sa_spamc_binaries [4] = {"spamc", "${LOCALBASE}/bin/spamc", "/usr/sbin/spamc", NULL};
+static const gchar *em_junk_sa_spamd_binaries [4] = {"spamd", "${LOCALBASE}/bin/spamd", "/usr/sbin/spamd", NULL};
#define SPAMD_RESTARTS_SIZE 8
static time_t em_junk_sa_spamd_restarts[SPAMD_RESTARTS_SIZE] = {0, 0, 0, 0, 0, 0, 0, 0};

11
mail/evolution/pkg/DESCR-main
View File

@ -1,9 +1,2 @@
Evolution integrates email, calendaring, meeting scheduling, contact
management and online task lists into one application.
Evolution supports a number of communication standards including SMTP,
SMTP/Authorized, POP, IMAP, Kerberos and others. Peer-to-peer
calendaring is also supported with products that support iCalendar such
as Microsoft Exchange or Lotus Notes. Evolution can also import
mailboxes created with Netscape, Outlook Express, UNIX mbox, Eudora and
other email managers.
Evolution provides integrated mail, addressbook and calendaring
functionality to users of the GNOME desktop.

4
mail/evolution/pkg/DESCR-plugins
View File

@ -1,5 +1,5 @@
Evolution integrates email, calendaring, meeting scheduling, contact
management and online task lists into one application.
Evolution provides integrated mail, addressbook and calendaring
functionality to users of the GNOME desktop.
This package provides additionnal plugins from the "standard" list for
evolution.

3
mail/evolution/pkg/MESSAGE-main
View File

@ -1,3 +0,0 @@
Note that for evolution to check incoming messages for junk, the
bogofilter or p5-Mail-SpamAssassin package needs to be installed.
It's configured under "Preferences - Mail Preferences - Junk".

8
mail/evolution/pkg/PFRAG.shared-main
View File

@ -1,5 +1,4 @@
@comment $OpenBSD: PFRAG.shared-main,v 1.6 2010/09/30 08:01:26 ajacoutot Exp $
@lib lib/evolution/${R}/libart_lgpl.so.${LIBart_lgpl_VERSION}
@comment $OpenBSD: PFRAG.shared-main,v 1.7 2011/09/12 07:26:19 ajacoutot Exp $
@lib lib/evolution/${R}/libcomposer.so.${LIBcomposer_VERSION}
@lib lib/evolution/${R}/libeabutil.so.${LIBeabutil_VERSION}
@lib lib/evolution/${R}/libecontacteditor.so.${LIBecontacteditor_VERSION}
@ -28,7 +27,9 @@ lib/evolution/${R}/modules/libevolution-module-calendar.so
lib/evolution/${R}/modules/libevolution-module-composer-autosave.so
lib/evolution/${R}/modules/libevolution-module-mail.so
lib/evolution/${R}/modules/libevolution-module-mailto-handler.so
lib/evolution/${R}/modules/libevolution-module-offline-alert.so
lib/evolution/${R}/modules/libevolution-module-plugin-lib.so
lib/evolution/${R}/modules/libevolution-module-plugin-manager.so
lib/evolution/${R}/modules/libevolution-module-startup-wizard.so
lib/evolution/${R}/plugins/liborg-gnome-addressbook-file.so
lib/evolution/${R}/plugins/liborg-gnome-bogo-junk-plugin.so
@ -40,12 +41,9 @@ lib/evolution/${R}/plugins/liborg-gnome-evolution-caldav.so
lib/evolution/${R}/plugins/liborg-gnome-evolution-google.so
lib/evolution/${R}/plugins/liborg-gnome-evolution-webdav.so
lib/evolution/${R}/plugins/liborg-gnome-groupwise-features.so
lib/evolution/${R}/plugins/liborg-gnome-image-inline.so
lib/evolution/${R}/plugins/liborg-gnome-imap-features.so
lib/evolution/${R}/plugins/liborg-gnome-itip-formatter.so
lib/evolution/${R}/plugins/liborg-gnome-mark-all-read.so
lib/evolution/${R}/plugins/liborg-gnome-plugin-manager.so
lib/evolution/${R}/plugins/liborg-gnome-pst-import.so
lib/evolution/${R}/plugins/liborg-gnome-publish-calendar.so
lib/evolution/${R}/plugins/liborg-gnome-sa-junk-plugin.so
lib/evolution/${R}/plugins/liborg-gnome-vcard-inline.so

5
mail/evolution/pkg/PFRAG.shared-plugins
View File

@ -1,14 +1,15 @@
@comment $OpenBSD: PFRAG.shared-plugins,v 1.4 2010/09/30 08:01:26 ajacoutot Exp $
@comment $OpenBSD: PFRAG.shared-plugins,v 1.5 2011/09/12 07:26:19 ajacoutot Exp $
lib/evolution/${R}/plugins/liborg-gnome-audio-inline.so
lib/evolution/${R}/plugins/liborg-gnome-backup-restore.so
lib/evolution/${R}/plugins/liborg-gnome-dbx-import.so
lib/evolution/${R}/plugins/liborg-gnome-email-custom-header.so
lib/evolution/${R}/plugins/liborg-gnome-evolution-attachment-reminder.so
lib/evolution/${R}/plugins/liborg-gnome-evolution-bbdb.so
lib/evolution/${R}/plugins/liborg-gnome-face.so
lib/evolution/${R}/plugins/liborg-gnome-mail-notification.so
lib/evolution/${R}/plugins/liborg-gnome-mail-to-task.so
lib/evolution/${R}/plugins/liborg-gnome-mailing-list-actions.so
lib/evolution/${R}/plugins/liborg-gnome-prefer-plain.so
lib/evolution/${R}/plugins/liborg-gnome-save-calendar.so
lib/evolution/${R}/plugins/liborg-gnome-subject-thread.so
lib/evolution/${R}/plugins/liborg-gnome-templates.so
lib/evolution/${R}/plugins/liborg-gnome-vcard-inline.so

Some files were not shown because too many files have changed in this diff Show More