mirror of
https://git.FreeBSD.org/ports.git
synced 2025-01-11 07:22:22 +00:00
Update to 3.8.1
This commit is contained in:
parent
a4c2f9374f
commit
4e59749957
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=42298
@ -6,8 +6,7 @@
|
||||
#
|
||||
|
||||
PORTNAME= xfce
|
||||
PORTVERSION= 3.7.2
|
||||
PORTREVISION= 1
|
||||
PORTVERSION= 3.8.1
|
||||
CATEGORIES= x11-wm
|
||||
MASTER_SITES= http://www.xfce.org/archive/
|
||||
|
||||
|
@ -1 +1 @@
|
||||
MD5 (xfce-3.7.2.tar.gz) = bfa75eebe26852f7377c639e8abcbe4f
|
||||
MD5 (xfce-3.8.1.tar.gz) = 6cc4a90a0d5e45b8f4e3ba06a08981aa
|
||||
|
@ -1,11 +1,11 @@
|
||||
--- libs/configure.h.orig Tue Sep 5 02:26:09 2000
|
||||
+++ libs/configure.h Wed Feb 7 00:53:01 2001
|
||||
--- libs/configure.h.orig Sat Apr 14 04:55:30 2001
|
||||
+++ libs/configure.h Sun May 6 08:03:18 2001
|
||||
@@ -22,7 +22,7 @@
|
||||
#define CLOSE_STRING4 "quit"
|
||||
|
||||
/* #ifdef __alpha */
|
||||
-#if defined(__alpha) && !defined(linux)
|
||||
+#if defined(__alpha) && !(defined(linux) || defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__))
|
||||
-#if defined(__alpha) && !defined(linux) && !defined(__DECC)
|
||||
+#if defined(__alpha) && !(defined(linux) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)) && !defined(__DECC)
|
||||
#define NEEDS_ALPHA_HEADER
|
||||
#undef BROKEN_SUN_HEADERS
|
||||
#endif /* (__alpha) */
|
||||
|
@ -1,37 +0,0 @@
|
||||
--- xfwm/session.c.orig Wed Jan 31 04:50:16 2001
|
||||
+++ xfwm/session.c Tue Feb 6 04:56:10 2001
|
||||
@@ -566,8 +566,10 @@
|
||||
callback_save_yourself2 (SmcConn sm_conn, SmPointer client_data)
|
||||
{
|
||||
char *path = NULL;
|
||||
- char *filename = NULL;
|
||||
- FILE *f = NULL;
|
||||
+ char *filename;
|
||||
+ FILE *f;
|
||||
+ int fd;
|
||||
+
|
||||
Bool success = True;
|
||||
struct passwd *pwd;
|
||||
|
||||
@@ -578,16 +580,18 @@
|
||||
path = pwd->pw_dir;
|
||||
}
|
||||
|
||||
- filename = tempnam (path, ".fs-");
|
||||
+ sprintf (filename, "path/.fs-XXXXXXXX");
|
||||
+ fd = mkstemp (filename);
|
||||
|
||||
if (Scr.Options & SessionMgt)
|
||||
{
|
||||
- f = fopen (filename, "w");
|
||||
+ f = fdopen (fd, "w");
|
||||
success = save_session_state (sm_conn, filename, f);
|
||||
fclose (f);
|
||||
}
|
||||
- if (!success)
|
||||
+ if (!success || fd < 0)
|
||||
xfwm_msg (WARN, "SaveSession", "Can't save session\n");
|
||||
+ close (fd);
|
||||
/* also save session for builtin session mgt, so user will get
|
||||
* back to his environmnent even if he doesn't use ICE
|
||||
*/
|
11
x11-wm/xfce/files/patch-ak
Normal file
11
x11-wm/xfce/files/patch-ak
Normal file
@ -0,0 +1,11 @@
|
||||
--- xfce/setup.c.orig Sun May 6 08:51:24 2001
|
||||
+++ xfce/setup.c Sun May 6 08:51:34 2001
|
||||
@@ -132,7 +132,7 @@
|
||||
list = g_list_append(list, "xfce");
|
||||
|
||||
/* Try to find the location of gtk engines */
|
||||
- if ((pdata=popen("gtk-config --prefix","r")) != NULL
|
||||
+ if ((pdata=popen("gtk12-config --prefix","r")) != NULL
|
||||
&& fgets(buffer, sizeof(buffer), pdata) != NULL)
|
||||
{
|
||||
char *path;
|
@ -20,6 +20,7 @@ bin/xfpager
|
||||
bin/xfplay
|
||||
bin/xfprint
|
||||
bin/xfrun
|
||||
bin/xfsamba
|
||||
bin/xfsound
|
||||
bin/xfterm
|
||||
bin/xftrash
|
||||
@ -170,6 +171,7 @@ share/xfce/backdrops/Wood2.xpm
|
||||
share/xfce/backdrops/Worm.xpm
|
||||
share/xfce/backdrops/Xfce.jpg
|
||||
share/xfce/backdrops/Xfce.xpm
|
||||
share/xfce/backdrops/Xfcelogo.xpm
|
||||
share/xfce/backdrops/Xfcemice.jpg
|
||||
share/xfce/fonts/cursor2.pcf
|
||||
share/xfce/fonts/fonts.dir
|
||||
@ -336,6 +338,7 @@ share/xfce/palettes/HiContrast
|
||||
share/xfce/palettes/HiTech
|
||||
share/xfce/palettes/HiTech2
|
||||
share/xfce/palettes/Iceland
|
||||
share/xfce/palettes/Jazza
|
||||
share/xfce/palettes/Liquid
|
||||
share/xfce/palettes/Liquid2
|
||||
share/xfce/palettes/Mauve
|
||||
@ -368,6 +371,7 @@ share/xfce/palettes/TBlue
|
||||
share/xfce/palettes/Teal
|
||||
share/xfce/palettes/Tiny
|
||||
share/xfce/palettes/Tommy
|
||||
share/xfce/palettes/Tradition
|
||||
share/xfce/palettes/Troica
|
||||
share/xfce/palettes/Typhoon
|
||||
share/xfce/palettes/Win
|
||||
@ -447,12 +451,12 @@ share/xfce/textures/oldwood.xpm
|
||||
share/xfce/textures/paper.xpm
|
||||
share/xfce/textures/silver.xpm
|
||||
share/xfce/textures/stripe.xpm
|
||||
@dirrm share/xfce/textures
|
||||
@dirrm share/xfce/sounds
|
||||
@dirrm share/xfce/palettes
|
||||
@dirrm share/xfce/icons
|
||||
@dirrm share/xfce/help
|
||||
@dirrm share/xfce/fonts
|
||||
@dirrm share/xfce/backdrops
|
||||
@dirrm share/xfce
|
||||
@dirrm etc/xfce
|
||||
@dirrm share/xfce/backdrops
|
||||
@dirrm share/xfce/fonts
|
||||
@dirrm share/xfce/help
|
||||
@dirrm share/xfce/icons
|
||||
@dirrm share/xfce/palettes
|
||||
@dirrm share/xfce/sounds
|
||||
@dirrm share/xfce/textures
|
||||
@dirrm share/xfce
|
||||
|
@ -6,8 +6,7 @@
|
||||
#
|
||||
|
||||
PORTNAME= xfce
|
||||
PORTVERSION= 3.7.2
|
||||
PORTREVISION= 1
|
||||
PORTVERSION= 3.8.1
|
||||
CATEGORIES= x11-wm
|
||||
MASTER_SITES= http://www.xfce.org/archive/
|
||||
|
||||
|
@ -1 +1 @@
|
||||
MD5 (xfce-3.7.2.tar.gz) = bfa75eebe26852f7377c639e8abcbe4f
|
||||
MD5 (xfce-3.8.1.tar.gz) = 6cc4a90a0d5e45b8f4e3ba06a08981aa
|
||||
|
@ -1,11 +1,11 @@
|
||||
--- libs/configure.h.orig Tue Sep 5 02:26:09 2000
|
||||
+++ libs/configure.h Wed Feb 7 00:53:01 2001
|
||||
--- libs/configure.h.orig Sat Apr 14 04:55:30 2001
|
||||
+++ libs/configure.h Sun May 6 08:03:18 2001
|
||||
@@ -22,7 +22,7 @@
|
||||
#define CLOSE_STRING4 "quit"
|
||||
|
||||
/* #ifdef __alpha */
|
||||
-#if defined(__alpha) && !defined(linux)
|
||||
+#if defined(__alpha) && !(defined(linux) || defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__))
|
||||
-#if defined(__alpha) && !defined(linux) && !defined(__DECC)
|
||||
+#if defined(__alpha) && !(defined(linux) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)) && !defined(__DECC)
|
||||
#define NEEDS_ALPHA_HEADER
|
||||
#undef BROKEN_SUN_HEADERS
|
||||
#endif /* (__alpha) */
|
||||
|
@ -1,37 +0,0 @@
|
||||
--- xfwm/session.c.orig Wed Jan 31 04:50:16 2001
|
||||
+++ xfwm/session.c Tue Feb 6 04:56:10 2001
|
||||
@@ -566,8 +566,10 @@
|
||||
callback_save_yourself2 (SmcConn sm_conn, SmPointer client_data)
|
||||
{
|
||||
char *path = NULL;
|
||||
- char *filename = NULL;
|
||||
- FILE *f = NULL;
|
||||
+ char *filename;
|
||||
+ FILE *f;
|
||||
+ int fd;
|
||||
+
|
||||
Bool success = True;
|
||||
struct passwd *pwd;
|
||||
|
||||
@@ -578,16 +580,18 @@
|
||||
path = pwd->pw_dir;
|
||||
}
|
||||
|
||||
- filename = tempnam (path, ".fs-");
|
||||
+ sprintf (filename, "path/.fs-XXXXXXXX");
|
||||
+ fd = mkstemp (filename);
|
||||
|
||||
if (Scr.Options & SessionMgt)
|
||||
{
|
||||
- f = fopen (filename, "w");
|
||||
+ f = fdopen (fd, "w");
|
||||
success = save_session_state (sm_conn, filename, f);
|
||||
fclose (f);
|
||||
}
|
||||
- if (!success)
|
||||
+ if (!success || fd < 0)
|
||||
xfwm_msg (WARN, "SaveSession", "Can't save session\n");
|
||||
+ close (fd);
|
||||
/* also save session for builtin session mgt, so user will get
|
||||
* back to his environmnent even if he doesn't use ICE
|
||||
*/
|
11
x11-wm/xfce4/files/patch-ak
Normal file
11
x11-wm/xfce4/files/patch-ak
Normal file
@ -0,0 +1,11 @@
|
||||
--- xfce/setup.c.orig Sun May 6 08:51:24 2001
|
||||
+++ xfce/setup.c Sun May 6 08:51:34 2001
|
||||
@@ -132,7 +132,7 @@
|
||||
list = g_list_append(list, "xfce");
|
||||
|
||||
/* Try to find the location of gtk engines */
|
||||
- if ((pdata=popen("gtk-config --prefix","r")) != NULL
|
||||
+ if ((pdata=popen("gtk12-config --prefix","r")) != NULL
|
||||
&& fgets(buffer, sizeof(buffer), pdata) != NULL)
|
||||
{
|
||||
char *path;
|
@ -20,6 +20,7 @@ bin/xfpager
|
||||
bin/xfplay
|
||||
bin/xfprint
|
||||
bin/xfrun
|
||||
bin/xfsamba
|
||||
bin/xfsound
|
||||
bin/xfterm
|
||||
bin/xftrash
|
||||
@ -170,6 +171,7 @@ share/xfce/backdrops/Wood2.xpm
|
||||
share/xfce/backdrops/Worm.xpm
|
||||
share/xfce/backdrops/Xfce.jpg
|
||||
share/xfce/backdrops/Xfce.xpm
|
||||
share/xfce/backdrops/Xfcelogo.xpm
|
||||
share/xfce/backdrops/Xfcemice.jpg
|
||||
share/xfce/fonts/cursor2.pcf
|
||||
share/xfce/fonts/fonts.dir
|
||||
@ -336,6 +338,7 @@ share/xfce/palettes/HiContrast
|
||||
share/xfce/palettes/HiTech
|
||||
share/xfce/palettes/HiTech2
|
||||
share/xfce/palettes/Iceland
|
||||
share/xfce/palettes/Jazza
|
||||
share/xfce/palettes/Liquid
|
||||
share/xfce/palettes/Liquid2
|
||||
share/xfce/palettes/Mauve
|
||||
@ -368,6 +371,7 @@ share/xfce/palettes/TBlue
|
||||
share/xfce/palettes/Teal
|
||||
share/xfce/palettes/Tiny
|
||||
share/xfce/palettes/Tommy
|
||||
share/xfce/palettes/Tradition
|
||||
share/xfce/palettes/Troica
|
||||
share/xfce/palettes/Typhoon
|
||||
share/xfce/palettes/Win
|
||||
@ -447,12 +451,12 @@ share/xfce/textures/oldwood.xpm
|
||||
share/xfce/textures/paper.xpm
|
||||
share/xfce/textures/silver.xpm
|
||||
share/xfce/textures/stripe.xpm
|
||||
@dirrm share/xfce/textures
|
||||
@dirrm share/xfce/sounds
|
||||
@dirrm share/xfce/palettes
|
||||
@dirrm share/xfce/icons
|
||||
@dirrm share/xfce/help
|
||||
@dirrm share/xfce/fonts
|
||||
@dirrm share/xfce/backdrops
|
||||
@dirrm share/xfce
|
||||
@dirrm etc/xfce
|
||||
@dirrm share/xfce/backdrops
|
||||
@dirrm share/xfce/fonts
|
||||
@dirrm share/xfce/help
|
||||
@dirrm share/xfce/icons
|
||||
@dirrm share/xfce/palettes
|
||||
@dirrm share/xfce/sounds
|
||||
@dirrm share/xfce/textures
|
||||
@dirrm share/xfce
|
||||
|
Loading…
Reference in New Issue
Block a user