head 1.5; access; symbols pkgsrc-2013Q2:1.5.0.26 pkgsrc-2013Q2-base:1.5 pkgsrc-2012Q4:1.5.0.24 pkgsrc-2012Q4-base:1.5 pkgsrc-2011Q4:1.5.0.22 pkgsrc-2011Q4-base:1.5 pkgsrc-2011Q2:1.5.0.20 pkgsrc-2011Q2-base:1.5 pkgsrc-2009Q4:1.5.0.18 pkgsrc-2009Q4-base:1.5 pkgsrc-2008Q4:1.5.0.16 pkgsrc-2008Q4-base:1.5 pkgsrc-2008Q3:1.5.0.14 pkgsrc-2008Q3-base:1.5 cube-native-xorg:1.5.0.12 cube-native-xorg-base:1.5 pkgsrc-2008Q2:1.5.0.10 pkgsrc-2008Q2-base:1.5 pkgsrc-2008Q1:1.5.0.8 pkgsrc-2008Q1-base:1.5 pkgsrc-2007Q4:1.5.0.6 pkgsrc-2007Q4-base:1.5 pkgsrc-2007Q3:1.5.0.4 pkgsrc-2007Q3-base:1.5 pkgsrc-2007Q2:1.5.0.2 pkgsrc-2007Q2-base:1.5 pkgsrc-2007Q1:1.4.0.2 pkgsrc-2007Q1-base:1.4 XFCE-4_2_x:1.4 pkgsrc-2006Q4:1.3.0.2 pkgsrc-2006Q4-base:1.3 pkgsrc-2006Q3:1.2.0.10 pkgsrc-2006Q3-base:1.2 pkgsrc-2006Q2:1.2.0.8 pkgsrc-2006Q2-base:1.2 pkgsrc-2006Q1:1.2.0.6 pkgsrc-2006Q1-base:1.2 pkgsrc-2005Q4:1.2.0.4 pkgsrc-2005Q4-base:1.2 pkgsrc-2005Q3:1.2.0.2; locks; strict; comment @# @; 1.5 date 2007.04.12.09.55.21; author martti; state dead; branches; next 1.4; 1.4 date 2007.01.23.11.53.47; author martti; state Exp; branches; next 1.3; 1.3 date 2006.11.28.19.20.34; author rillig; state Exp; branches; next 1.2; 1.2 date 2005.11.09.06.42.59; author martti; state dead; branches 1.2.2.1; next 1.1; 1.1 date 2005.11.06.05.29.55; author martti; state Exp; branches; next ; 1.2.2.1 date 2005.11.09.06.42.59; author salo; state dead; branches; next 1.2.2.2; 1.2.2.2 date 2005.11.15.10.32.51; author salo; state Exp; branches; next ; desc @@ 1.5 log @Updated to Xfce 4.4.1 See http://www.xfce.org/documentation/changelogs/4.4.1 for details. @ text @$NetBSD: patch-aa,v 1.4 2007/01/23 11:53:47 martti Exp $ No, it's not ok. Except for GNU C. --- libxfce4util/xfce-miscutils.h.orig 2007-01-13 21:41:32.000000000 +0000 +++ libxfce4util/xfce-miscutils.h 2007-01-23 11:26:14.000000000 +0000 @@@@ -32,12 +32,11 @@@@ #include -/* This looks a bit "hacky", but its ok */ -#define _BUILTIN_LICENSE_TEXT(name) \ -({ \ - extern const char xfce_builtin_license_##name[]; \ - xfce_builtin_license_##name; \ -}) +extern const char xfce_builtin_license_BSD[]; +extern const char xfce_builtin_license_GPL[]; +extern const char xfce_builtin_license_LGPL[]; + +#define _BUILTIN_LICENSE_TEXT(name) xfce_builtin_license_##name #if defined (__sun) extern const char xfce_builtin_license_BSD[]; @ 1.4 log @Xfce 4.2.4 released A new bug fix release of Xfce 4.2 is available. This release is supposed to be the last release for the 4.2 branch. It includes several fixes ported from the current developpment branch. This release should not be confused with the upcoming Xfce 4.4 release [1], it's a bug fix release of the previous stable branch. [1] Xfce 4.4.0 is already in pkgsrc-wip. @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.3 2006/11/28 19:20:34 rillig Exp $ @ 1.3 log @Compilers other than GCC usually don't know the ({ ... }) construct. @ text @d1 1 a1 1 $NetBSD$ d5 2 a6 2 --- libxfce4util/xfce-miscutils.h.orig 2005-11-15 12:59:47.000000000 +0100 +++ libxfce4util/xfce-miscutils.h 2006-11-28 20:11:55.609975108 +0100 d23 2 a24 2 #define XFCE_LICENSE_BSD _BUILTIN_LICENSE_TEXT(BSD) @ 1.2 log @Updated xfce4 to 4.2.3.1 * Lots of bug fixes * Translation updates Official ChangeLog is available at: http://www.xfce.org/release_notes/4.2.3.1_changelog.html @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.1 2005/11/06 05:29:55 martti Exp $ d3 21 a23 4 --- libxfce4util/licenses-texts.c.orig 2005-11-05 18:23:41.000000000 +0100 +++ libxfce4util/licenses-texts.c 2005-11-05 18:24:05.000000000 +0100 @@@@ -1,7 +1,7 @@@@ /* Auto generated file, do not edit */ a24 6 /* Keep the license stuff in one section if possible */ -#if defined(__GNUC__) +#if defined(__GNUC__) && !defined(__APPLE__) #define SECTION __attribute__((section(".xfce.LICENSES"))) #else #define SECTION @ 1.2.2.1 log @file patch-aa was added on branch pkgsrc-2005Q3 on 2005-11-09 06:42:59 +0000 @ text @d1 13 @ 1.2.2.2 log @Pullup ticket 896 - requested by Martti Kuparinen portability fix for libxfce4util Revisions pulled up: - pkgsrc/x11/libxfce4util/distinfo 1.12 - pkgsrc/x11/libxfce4util/patches/patch-aa 1.1 Module Name: pkgsrc Committed By: martti Date: Sun Nov 6 05:29:55 UTC 2005 Modified Files: pkgsrc/x11/libxfce4util: distinfo Added Files: pkgsrc/x11/libxfce4util/patches: patch-aa Log Message: Make this compile on Darwin 8.2.0/powerpc. Patch from Krister Walfridsson. @ text @a0 13 $NetBSD: patch-aa,v 1.2.2.1 2005/11/15 10:32:51 salo Exp $ --- libxfce4util/licenses-texts.c.orig 2005-11-05 18:23:41.000000000 +0100 +++ libxfce4util/licenses-texts.c 2005-11-05 18:24:05.000000000 +0100 @@@@ -1,7 +1,7 @@@@ /* Auto generated file, do not edit */ /* Keep the license stuff in one section if possible */ -#if defined(__GNUC__) +#if defined(__GNUC__) && !defined(__APPLE__) #define SECTION __attribute__((section(".xfce.LICENSES"))) #else #define SECTION @ 1.1 log @Make this compile on Darwin 8.2.0/powerpc. Patch from Krister Walfridsson. @ text @d1 1 a1 1 $NetBSD$ @