Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=17eb383f801d2df8502ce5e6c6d36a24c0de2ba1

commit 17eb383f801d2df8502ce5e6c6d36a24c0de2ba1
Author: crazy <[EMAIL PROTECTED]>
Date:   Wed Jan 23 19:52:39 2008 +0100

gdm-2.20.3-1-i686
* Version bump
* removed all old not used patches
* rediffed gksu patch
* added an new patch to fix the build
* added missing rodepends() on gksu
* compiled with -fno-strict-aliasing , without
* parts gets missicompiled

diff --git a/source/gnome/gdm/FrugalBuild b/source/gnome/gdm/FrugalBuild
index 8a85de7..5c29d5f 100644
--- a/source/gnome/gdm/FrugalBuild
+++ b/source/gnome/gdm/FrugalBuild
@@ -2,30 +2,34 @@
# Maintainer: Christian Hamar alias krix <[EMAIL PROTECTED]>

pkgname=gdm
-pkgver=2.20.1
+pkgver=2.20.3
pkgrel=1
pkgdesc="GNOME Display Manager"
url="http://www.gnome.org/";
backup=(etc/gdm/custom.conf)
-depends=('zenity>=2.20.0' 'libgnomeui>=2.20.1.1' 'libxi' 'fontconfig' 
'libxrandr' 'librsvg>=2.16.2' \
-        'libxinerama' 'libxcursor' 'libxevie' 'xorg-server')
-rodepends=('xsm' 'sessreg' 'gksu' 'xmessage')
+depends=('zenity>=2.20.0' 'libgnomeui>=2.20.1.1' 'libxi' 'fontconfig' 
'libxrandr>=1.2.2' 'librsvg>=2.20.0' \
+        'libxinerama' 'libxcursor' 'libxevie' 'xorg-server>=1.4.0.90-4')
+rodepends=('xsm' 'sessreg' 'gksu' 'xmessage' 'gksu')
makedepends=('intltool' 'gnome-doc-utils')
groups=('gnome' 'gnome-minimal')
archs=('i686' 'x86_64')
Finclude gnome
options=([EMAIL PROTECTED] 'force')
-source=([EMAIL PROTECTED] $pkgname-$pkgver-gdmconf.patch \
-       $pkgname-2.18.0-gksu.patch \
+source=([EMAIL PROTECTED] $pkgname-2.20.1-gdmconf.patch \
+       $pkgname-gksu.patch \
fix_reboot_path.patch \
+       gdm-fix-the-build.patch \
http://ftp.frugalware.org/pub/other/artwork/gdm-theme/GDM-Frugalware-0.7.tar.bz2)
-sha1sums=('3d3e41ef1d3f808598f28d57166facee47e2addc' \
+sha1sums=('de66323b890f2e65a33bb72c5937d1c95ee5bd89' \
'bc0209e8700b01e2369a66e93b2c86766ff988fd' \
-          'a702961b7851b1e7c946fc8e3fb29bd1d807a02f' \
+          '05f42c18c0ce9fedfeda7de980d230b34a574f2c' \
'b602b6805d1d4787e4404827abf3d6f346843317' \
+          '7c00f8c4501d13368f4a25cf34422108356f8761' \
'b13852bf7ce59df5d02f27b3603e274fba3e074d')

build() {
+
+       export CFLAGS="$CFLAGS -fno-strict-aliasing"
Fcd
Fpatchall
Fautoreconf
diff --git a/source/gnome/gdm/gdm-2.17.6-no-X11R6.patch 
b/source/gnome/gdm/gdm-2.17.6-no-X11R6.patch
deleted file mode 100644
index 085e663..0000000
--- a/source/gnome/gdm/gdm-2.17.6-no-X11R6.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-diff -urN gdm-2.17.6.orig/configure.ac gdm-2.17.6/configure.ac
---- gdm-2.17.6.orig/configure.ac       2007-02-09 16:22:23.000000000 +0000
-+++ gdm-2.17.6/configure.ac    2007-02-09 16:26:59.000000000 +0000
-@@ -1000,7 +1000,12 @@
- # symlink to each other, and configure should use the more stable
- # location (the real directory) if possible.
- #
--if test ! -h /usr/X11R6 -a -x /usr/X11R6/bin/X; then
-+if test -x /usr/bin/X; then
-+   X_PATH="/usr/bin"
-+   X_SERVER_PATH="/usr/bin"
-+   X_SERVER="/usr/bin/X"
-+   X_CONFIG_OPTIONS="-audit 0"
-+elif test ! -h /usr/X11R6 -a -x /usr/X11R6/bin/X; then
-    X_PATH="/usr/X11R6/bin"
-    X_SERVER_PATH="/usr/X11R6/bin"
-    X_SERVER="/usr/X11R6/bin/X"
-@@ -1043,11 +1048,6 @@
-    X_SERVER="/opt/X11R6/bin/X"
-    GDM_USER_PATH="$GDM_USER_PATH:/opt/X11R6/bin"
-    X_CONFIG_OPTIONS="-audit 0"
--elif test -x /usr/bin/X; then
--   X_PATH="/usr/bin"
--   X_SERVER_PATH="/usr/bin"
--   X_SERVER="/usr/bin/X"
--   X_CONFIG_OPTIONS="-audit 0"
- else
-    # what to do, what to do, this is wrong, but this just sets the
-    # defaults, perhaps this user is cross compiling or some such
diff --git a/source/gnome/gdm/gdm-2.18.0-gksu.patch 
b/source/gnome/gdm/gdm-2.18.0-gksu.patch
deleted file mode 100644
index b151f6b..0000000
--- a/source/gnome/gdm/gdm-2.18.0-gksu.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -urN gdm-2.18.0.orig/gui/gdmsetup.desktop.in.in 
gdm-2.18.0/gui/gdmsetup.desktop.in.in
---- gdm-2.18.0.orig/gui/gdmsetup.desktop.in.in 2007-03-14 16:33:17.000000000 
+0000
-+++ gdm-2.18.0/gui/gdmsetup.desktop.in.in      2007-03-14 16:34:53.000000000 
+0000
-@@ -2,8 +2,8 @@
- Encoding=UTF-8
- _Name=Login Window
- _Comment=Configure GDM login window appearance and behavior
[EMAIL PROTECTED]@/gdmsetup
[EMAIL PROTECTED]@/gdmsetup
-+TryExec=gksu @sbindir@/gdmsetup
-+Exec=gksu @sbindir@/gdmsetup
- Icon=gdm-setup
- StartupNotify=true
- Terminal=false
diff --git a/source/gnome/gdm/gdm-2.18.1-desktop-fix-from-svn.patch 
b/source/gnome/gdm/gdm-2.18.1-desktop-fix-from-svn.patch
deleted file mode 100644
index b64c9cc..0000000
--- a/source/gnome/gdm/gdm-2.18.1-desktop-fix-from-svn.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -urN gdm-2.18.1.orig/gui/gdmphotosetup.desktop.in 
gdm-2.18.1/gui/gdmphotosetup.desktop.in
---- gdm-2.18.1.orig/gui/gdmphotosetup.desktop.in       2007-04-15 
10:44:07.000000000 +0100
-+++ gdm-2.18.1/gui/gdmphotosetup.desktop.in    2007-04-15 10:44:45.000000000 
+0100
-@@ -9,6 +9,7 @@
- StartupNotify=true
- Terminal=false
- Type=Application
-+NotShowIn=GNOME;
- Categories=GNOME;GTK;Settings;
- X-GNOME-Bugzilla-Bugzilla=GNOME
- X-GNOME-Bugzilla-Product=gdm
diff --git a/source/gnome/gdm/gdm-fix-the-build.patch 
b/source/gnome/gdm/gdm-fix-the-build.patch
new file mode 100644
index 0000000..b1f5d87
--- /dev/null
+++ b/source/gnome/gdm/gdm-fix-the-build.patch
@@ -0,0 +1,20 @@
+--- gdm-2.20.3/daemon/verify-crypt.c.orig      2008-01-07 19:39:37.000000000 
+0000
++++ gdm-2.20.3/daemon/verify-crypt.c   2008-01-09 13:39:50.000000000 +0000
+@@ -43,6 +43,7 @@
+ #include "gdm-common.h"
+ #include "gdm-daemon-config.h"
+ #include "gdm-socket-protocol.h"
++#include "gdm-log.h"
+
+ static char *selected_user = NULL;
+
+--- gdm-2.20.3/daemon/verify-shadow.c.orig     2008-01-07 19:39:37.000000000 
+0000
++++ gdm-2.20.3/daemon/verify-shadow.c  2008-01-09 13:39:43.000000000 +0000
+@@ -44,6 +44,7 @@
+ #include "gdm-common.h"
+ #include "gdm-daemon-config.h"
+ #include "gdm-socket-protocol.h"
++#include "gdm-log.h"
+
+ static char *selected_user = NULL;
+
diff --git a/source/gnome/gdm/gdm-gksu.patch b/source/gnome/gdm/gdm-gksu.patch
new file mode 100644
index 0000000..22e6b4f
--- /dev/null
+++ b/source/gnome/gdm/gdm-gksu.patch
@@ -0,0 +1,14 @@
+diff -Naur gdm-2.20.3/gui/gdmsetup.desktop.in.in 
gdm-2.20.3-p/gui/gdmsetup.desktop.in.in
+--- gdm-2.20.3/gui/gdmsetup.desktop.in.in      2008-01-07 20:39:05.000000000 
+0100
++++ gdm-2.20.3-p/gui/gdmsetup.desktop.in.in    2008-01-23 19:03:42.000000000 
+0100
+@@ -2,8 +2,8 @@
+ Encoding=UTF-8
+ _Name=Login Window
+ _Comment=Configure GDM login window appearance and behavior
[EMAIL PROTECTED]@/gdmsetup
[EMAIL PROTECTED]@/gdmsetup
++TryExec=gksu @sbindir@/gdmsetup
++Exec=gksu @sbindir@/gdmsetup
+ Icon=gdmsetup
+ StartupNotify=true
+ Terminal=false
_______________________________________________
Frugalware-git mailing list
[email protected]
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to