Skip to content

Commit

Permalink
import gnome-desktop 3.0.1
Browse files Browse the repository at this point in the history
gnome-desktop contains the libgnome-desktop library as well as some
desktop-wide documents.

ok aja@
  • Loading branch information
jasperla committed May 13, 2011
1 parent 6642981 commit 823adc3
Show file tree
Hide file tree
Showing 5 changed files with 430 additions and 0 deletions.
49 changes: 49 additions & 0 deletions x11/gnome3/desktop/Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
# $OpenBSD: Makefile,v 1.1.1.1 2011/05/13 08:52:11 jasper Exp $

SHARED_ONLY= Yes

COMMENT= components for the GNOME desktop

GNOME_PROJECT= gnome-desktop
GNOME_VERSION= 3.0.1

SHARED_LIBS += gnome-desktop-3 0.0 # 0.9

CATEGORIES= x11

# LGPLv2/GFDLv1.1/GPLv2
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes

WANTLIB += GL ICE SM X11 Xau Xcomposite Xcursor Xdamage Xdmcp
WANTLIB += Xext Xfixes Xi Xinerama Xrandr Xrender Xxf86vm atk-1.0
WANTLIB += cairo cairo-gobject drm execinfo 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-stubs startup-notification-1
WANTLIB += xcb xcb-atom xcb-aux xcb-event xcb-render xcb-shm z

MODULES= devel/gettext \
x11/gnome

BUILD_DEPENDS= devel/gobject-introspection
LIB_DEPENDS= devel/startup-notification \
x11/gtk+3

MODGNOME_HELP_FILES= Yes
DESKTOP_FILES= Yes
CONFIGURE_ARGS+= ${CONFIGURE_SHARED}
CONFIGURE_ARGS+= --with-gnome-distributor="OpenBSD Ports" \
--disable-gtk-doc \
--enable-introspection
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"

# stop systrace spam by avoiding xsltproc to access net
pre-configure:
find ${WRKSRC}/desktop-docs/ -name Makefile.in \
-exec perl -pi -e 's,xsltproc,xsltproc --nonet,g' {} \;

.include <bsd.port.mk>
5 changes: 5 additions & 0 deletions x11/gnome3/desktop/distinfo
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
MD5 (gnome/gnome-desktop-3.0.1.tar.bz2) = /8DObpQTeG949Z8YZV6FIw==
RMD160 (gnome/gnome-desktop-3.0.1.tar.bz2) = KLIbtiSK+UBWXvWUT/wc/Q+Ygss=
SHA1 (gnome/gnome-desktop-3.0.1.tar.bz2) = LgBN3yhV1jumCuW9fazLdOJg3Rk=
SHA256 (gnome/gnome-desktop-3.0.1.tar.bz2) = bV4UCg1fm8Exyv9QW8Sir6EeGDlDf3/D2nMjizej8KM=
SIZE (gnome/gnome-desktop-3.0.1.tar.bz2) = 1246936
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
$OpenBSD: patch-libgnome-desktop_gnome-desktop-thumbnail_c,v 1.1.1.1 2011/05/13 08:52:11 jasper Exp $

gnome-desktop-thumbnail.c: In function `gnome_desktop_thumbnail_factory_save_thumbnail':
gnome-desktop-thumbnail.c:1052: warning: long int format, different type arg (arg 4)
gnome-desktop-thumbnail.c: In function `gnome_desktop_thumbnail_factory_create_failed_thumbnail':
gnome-desktop-thumbnail.c:1154: warning: long int format, different type arg (arg 4)

change atol -> atoll in line with the other changes.

--- libgnome-desktop/gnome-desktop-thumbnail.c.orig Tue Mar 22 15:30:35 2011
+++ libgnome-desktop/gnome-desktop-thumbnail.c Thu Apr 28 19:05:27 2011
@@ -1379,7 +1379,7 @@ gnome_desktop_thumbnail_factory_save_thumbnail (GnomeD
}
close (tmp_fd);

- g_snprintf (mtime_str, 21, "%ld", original_mtime);
+ g_snprintf (mtime_str, 21, "%lld", (long long)original_mtime);
width = gdk_pixbuf_get_option (thumbnail, "tEXt::Thumb::Image::Width");
height = gdk_pixbuf_get_option (thumbnail, "tEXt::Thumb::Image::Height");

@@ -1481,7 +1481,7 @@ gnome_desktop_thumbnail_factory_create_failed_thumbnai
}
close (tmp_fd);

- g_snprintf (mtime_str, 21, "%ld", mtime);
+ g_snprintf (mtime_str, 21, "%lld", (long long)mtime);
pixbuf = gdk_pixbuf_new (GDK_COLORSPACE_RGB, TRUE, 8, 1, 1);
saved_ok = gdk_pixbuf_save (pixbuf,
tmp_path,
@@ -1610,7 +1610,7 @@ gnome_desktop_thumbnail_is_valid (GdkPixbuf *
thumb_mtime_str = gdk_pixbuf_get_option (pixbuf, "tEXt::Thumb::MTime");
if (!thumb_mtime_str)
return FALSE;
- thumb_mtime = atol (thumb_mtime_str);
+ thumb_mtime = atoll (thumb_mtime_str);
if (mtime != thumb_mtime)
return FALSE;

2 changes: 2 additions & 0 deletions x11/gnome3/desktop/pkg/DESCR
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
gnome-desktop contains the libgnome-desktop library as well as some
desktop-wide documents.
Loading

0 comments on commit 823adc3

Please sign in to comment.