diff options
author | mezz <mezz@df743ca5-7f9a-e211-a948-0013205c9059> | 2011-04-26 05:58:25 +0800 |
---|---|---|
committer | mezz <mezz@df743ca5-7f9a-e211-a948-0013205c9059> | 2011-04-26 05:58:25 +0800 |
commit | e94987580b997f18538c077aa2ea4fd5a69b5ba0 (patch) | |
tree | 3bede5fb686582b38109f2507f545276462cb916 /x11/gnome-panel/files/patch-applets_clock_clock-location.c | |
parent | 7e0f7eeb00467164bb3c78c4b93d7891052bee76 (diff) | |
download | marcuscom-ports-e94987580b997f18538c077aa2ea4fd5a69b5ba0.tar marcuscom-ports-e94987580b997f18538c077aa2ea4fd5a69b5ba0.tar.gz marcuscom-ports-e94987580b997f18538c077aa2ea4fd5a69b5ba0.tar.bz2 marcuscom-ports-e94987580b997f18538c077aa2ea4fd5a69b5ba0.tar.lz marcuscom-ports-e94987580b997f18538c077aa2ea4fd5a69b5ba0.tar.xz marcuscom-ports-e94987580b997f18538c077aa2ea4fd5a69b5ba0.tar.zst marcuscom-ports-e94987580b997f18538c077aa2ea4fd5a69b5ba0.zip |
Add CONFLICTS with the each others.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@15874 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'x11/gnome-panel/files/patch-applets_clock_clock-location.c')
-rw-r--r-- | x11/gnome-panel/files/patch-applets_clock_clock-location.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/x11/gnome-panel/files/patch-applets_clock_clock-location.c b/x11/gnome-panel/files/patch-applets_clock_clock-location.c new file mode 100644 index 000000000..aa25ac2fc --- /dev/null +++ b/x11/gnome-panel/files/patch-applets_clock_clock-location.c @@ -0,0 +1,11 @@ +--- applets/clock/clock-location.c.orig 2008-04-07 17:17:51.000000000 -0400 ++++ applets/clock/clock-location.c 2008-04-07 22:54:31.000000000 -0400 +@@ -27,6 +27,8 @@ + #include "clock-marshallers.h" + #include "set-timezone.h" + ++#define daylight 1 ++ + G_DEFINE_TYPE (ClockLocation, clock_location, G_TYPE_OBJECT) + + typedef struct { |