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

- make sure gnome-desktop indicates the right version (ie, 2.28.1 instead of 2.28.0)

Browse Source 
- fix a possible 64-bit issue

from pkgsrc

ok aja@
This commit is contained in:
jasper 2009-10-29 08:35:34 +00:00
parent f00ed75c59
commit 5ff7e5ebd9
3 changed files with 55 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
x11/gnome/desktop/Makefile
View File

@ -1,9 +1,10 @@
# $OpenBSD: Makefile,v 1.51 2009/10/22 13:32:17 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.52 2009/10/29 08:35:34 jasper Exp $
COMMENT= components for the GNOME desktop
GNOME_PROJECT= gnome-desktop
GNOME_VERSION= 2.28.1
PKGNAME= ${DISTNAME}p0
SHARED_LIBS += gnome-desktop-2 7.0 # .15.2

15
x11/gnome/desktop/patches/patch-configure Normal file
View File

@ -0,0 +1,15 @@
$OpenBSD: patch-configure,v 1.3 2009/10/29 08:35:34 jasper Exp $
Pretend to be the correct version.
--- configure.orig Wed Oct 28 23:24:27 2009
+++ configure Wed Oct 28 23:24:35 2009
@@ -12385,7 +12385,7 @@ fi
GNOME_PLATFORM=2
GNOME_MINOR=28
-GNOME_MICRO=0
+GNOME_MICRO=1
GNOME_DISTRIBUTOR="GNOME.Org"
GNOME_DATE=`date +"%Y-%m-%d"`

38
x11/gnome/desktop/patches/patch-libgnome-desktop_gnome-desktop-thumbnail_c Normal file
View File

@ -0,0 +1,38 @@
$OpenBSD: patch-libgnome-desktop_gnome-desktop-thumbnail_c,v 1.1 2009/10/29 08:35:34 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 Wed Oct 28 23:20:50 2009
+++ libgnome-desktop/gnome-desktop-thumbnail.c Wed Oct 28 23:22:50 2009
@@ -1049,7 +1049,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");
@@ -1151,7 +1151,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,
@@ -1281,7 +1281,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;