diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index 9083fd6..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: xwnc -# $Id$ -NAME := xwnc -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/xwnc-debian-01.dpatch b/xwnc-debian-01.dpatch index 266471a..604d1eb 100644 --- a/xwnc-debian-01.dpatch +++ b/xwnc-debian-01.dpatch @@ -4,11 +4,10 @@ Index: Makefile.am =================================================================== RCS file: /cvs/underware/xwnc/Makefile.am,v -retrieving revision 1.1.1.1 -retrieving revision 1.2 -diff -b -B -u -r1.1.1.1 -r1.2 ---- xwnc/Makefile.am 26 Aug 2004 14:54:21 -0000 1.1.1.1 -+++ xwnc/Makefile.am 26 Aug 2004 16:14:13 -0000 1.2 +retrieving revision 1.3 +diff -u -r1.3 Makefile.am +--- xwnc/Makefile.am 27 Mar 2006 14:44:56 -0000 1.3 ++++ xwnc/Makefile.am 24 Apr 2006 18:17:12 -0000 @@ -1,37 +1,51 @@ ## -*- Makefile -*- mode ## Process this file with automake to create Makefile.in @@ -98,12 +97,24 @@ diff -b -B -u -r1.1.1.1 -r1.2 Index: configure.ac =================================================================== RCS file: /cvs/underware/xwnc/configure.ac,v -retrieving revision 1.1.1.1 -retrieving revision 1.3 -diff -b -B -u -r1.1.1.1 -r1.3 ---- xwnc/configure.ac 26 Aug 2004 14:54:21 -0000 1.1.1.1 -+++ xwnc/configure.ac 5 Sep 2005 13:00:41 -0000 1.3 -@@ -384,7 +384,12 @@ +retrieving revision 1.4 +diff -u -r1.4 configure.ac +--- xwnc/configure.ac 27 Mar 2006 14:44:56 -0000 1.4 ++++ xwnc/configure.ac 24 Apr 2006 18:17:12 -0000 +@@ -155,6 +155,12 @@ + AC_DEFINE(SCREENSAVER,1,[Support MIT-SCREEN-SAVER extension]) + fi + ++ARCH=$(arch) ++echo "$ARCH" ++if test "$ARCH" = "x86_64"; then ++ AC_DEFINE(_XSERVER64,1,[64 bits]) ++fi ++ + AM_CONDITIONAL(RES, [test x$RES = xyes]) + if test "$RES" = yes; then + AC_DEFINE(RES,1,[Support X resource extension]) +@@ -384,7 +390,12 @@ dnl FvwmAmetista stuff dnl @@ -117,7 +128,7 @@ diff -b -B -u -r1.1.1.1 -r1.3 FvwmAmetista_failure= NUCLEO_CPPFLAGS= NUCLEO_LDFLAGS= -@@ -460,9 +465,7 @@ +@@ -460,9 +471,7 @@ with_FvwmAmetista=no FvwmAmetista_failure="fvwm-insitu source code not found" fi @@ -127,7 +138,7 @@ diff -b -B -u -r1.1.1.1 -r1.3 # ametista NUCLEO_CPPFLAGS="`nucleo-config --cppflags`" NUCLEO_LDFLAGS="`nucleo-config --ldflags`" -@@ -477,6 +480,8 @@ +@@ -477,6 +486,8 @@ FVWM_LDFLAGS='${top_builddir}/'"fvwm-insitu/libs/libfvwm.a" FVWM_MODULEDIR='${libexecdir}/'"fvwm-insitu/$FVWM_VERSION" FVWM_MODULEDIR_EXPANDED="${LIBEXECDIR}/fvwm-insitu/$FVWM_VERSION" @@ -136,7 +147,7 @@ diff -b -B -u -r1.1.1.1 -r1.3 fi -@@ -519,6 +524,11 @@ +@@ -519,6 +530,11 @@ # ------------------------------------ @@ -148,7 +159,7 @@ diff -b -B -u -r1.1.1.1 -r1.3 AC_OUTPUT([ Makefile wncauth/Makefile -@@ -548,28 +558,6 @@ +@@ -548,28 +564,6 @@ xserver/GL/mesa/Makefile xserver/hw/Makefile xserver/hw/wnc/Makefile @@ -177,27 +188,13 @@ diff -b -B -u -r1.1.1.1 -r1.3 ]) dnl xserver/miext/Makefile -cvs server: tag METISSE_0_3_3 is not in file cygwin/README -cvs server: tag METISSE_0_3_3 is not in file cygwin/setup.hint -cvs server: tag METISSE_0_3_3 is not in file cygwin/xwnc-0.3.3-1.sh -cvs server: tag METISSE_0_3_3 is not in file cygwin/xwnc-0.3.3-2.sh -cvs server: tag METISSE_0_3_3 is not in file debian/Xwnc.1x -cvs server: tag METISSE_0_3_3 is not in file debian/changelog -cvs server: tag METISSE_0_3_3 is not in file debian/compat -cvs server: tag METISSE_0_3_3 is not in file debian/control -cvs server: tag METISSE_0_3_3 is not in file debian/copyright -cvs server: tag METISSE_0_3_3 is not in file debian/dirs -cvs server: tag METISSE_0_3_3 is not in file debian/rules -cvs server: debian/patches/00list is a new entry, no comparison available -cvs server: debian/patches/01.dpatch is a new entry, no comparison available Index: wncauth/wncproto.h =================================================================== RCS file: /cvs/underware/xwnc/wncauth/wncproto.h,v -retrieving revision 1.1.1.1 -retrieving revision 1.3 -diff -b -B -u -r1.1.1.1 -r1.3 ---- xwnc/wncauth/wncproto.h 26 Aug 2004 14:57:29 -0000 1.1.1.1 -+++ xwnc/wncauth/wncproto.h 8 Sep 2004 17:38:38 -0000 1.3 +retrieving revision 1.4 +diff -u -r1.4 wncproto.h +--- xwnc/wncauth/wncproto.h 27 Mar 2006 14:44:57 -0000 1.4 ++++ xwnc/wncauth/wncproto.h 24 Apr 2006 18:17:13 -0000 @@ -741,9 +741,11 @@ * ConfigureWindow - */ @@ -223,14 +220,65 @@ diff -b -B -u -r1.1.1.1 -r1.3 /*----------------------------------------------------------------------------- * UnmapWindow - +Index: xserver/fb/fbpict.c +=================================================================== +RCS file: /cvs/underware/xwnc/xserver/fb/fbpict.c,v +retrieving revision 1.1.1.1 +diff -u -r1.1.1.1 fbpict.c +--- xwnc/xserver/fb/fbpict.c 26 Aug 2004 14:55:53 -0000 1.1.1.1 ++++ xwnc/xserver/fb/fbpict.c 24 Apr 2006 18:17:14 -0000 +@@ -192,7 +192,7 @@ + } + + #if IMAGE_BYTE_ORDER == LSBFirst +- #define setupPackedReader(count,temp,where,workingWhere,workingVal) count=(int)where; \ ++ #define setupPackedReader(count,temp,where,workingWhere,workingVal) count=(long int)where; \ + temp=count&3; \ + where-=temp; \ + workingWhere=(CARD32 *)where; \ +@@ -1092,7 +1092,7 @@ + srcLine += srcStride; + w = width; + +- if(((int)src&1)==1) ++ if(((long int)src&1)==1) + { + s_16 = *src++; + d_16 = *dst; +@@ -1100,7 +1100,7 @@ + w--; + } + isrc=(CARD32 *)src; +- if(((int)dst&1)==0) ++ if(((long int)dst&1)==0) + { + idst=(CARD32 *)dst; + while (w>1) +@@ -1210,7 +1210,7 @@ + setupPackedReader(ws,wt,isrc,wsrc,workingSource); + + /* get to word aligned */ +- switch(!(int)dst&3) ++ switch(!(long int)dst&3) + { + case 1: + readPackedSource(rs); +@@ -1286,7 +1286,7 @@ + srcLine += srcStride; + w = width*3; + /* get to word aligned */ +- switch(!(int)src&3) ++ switch(!(long int)src&3) + { + case 1: + rd=alphamaskCombine24(*src++, *dst)>>8; Index: xserver/hw/wnc/dispcur.c =================================================================== RCS file: /cvs/underware/xwnc/xserver/hw/wnc/dispcur.c,v -retrieving revision 1.1.1.1 -retrieving revision 1.2 -diff -b -B -u -r1.1.1.1 -r1.2 ---- xwnc/xserver/hw/wnc/dispcur.c 26 Aug 2004 14:56:03 -0000 1.1.1.1 -+++ xwnc/xserver/hw/wnc/dispcur.c 8 Sep 2005 22:20:05 -0000 1.2 +retrieving revision 1.3 +diff -u -r1.3 dispcur.c +--- xwnc/xserver/hw/wnc/dispcur.c 27 Mar 2006 14:44:57 -0000 1.3 ++++ xwnc/xserver/hw/wnc/dispcur.c 24 Apr 2006 18:17:14 -0000 @@ -317,7 +317,7 @@ if (!ScreenPriv) return FALSE; @@ -243,11 +291,10 @@ diff -b -B -u -r1.1.1.1 -r1.2 Index: xserver/hw/wnc/rfb.h =================================================================== RCS file: /cvs/underware/xwnc/xserver/hw/wnc/rfb.h,v -retrieving revision 1.1.1.1 -retrieving revision 1.3 -diff -b -B -u -r1.1.1.1 -r1.3 ---- xwnc/xserver/hw/wnc/rfb.h 26 Aug 2004 14:56:04 -0000 1.1.1.1 -+++ xwnc/xserver/hw/wnc/rfb.h 8 Sep 2004 17:38:38 -0000 1.3 +retrieving revision 1.4 +diff -u -r1.4 rfb.h +--- xwnc/xserver/hw/wnc/rfb.h 27 Mar 2006 14:44:57 -0000 1.4 ++++ xwnc/xserver/hw/wnc/rfb.h 24 Apr 2006 18:17:14 -0000 @@ -319,7 +319,7 @@ void rfbSendConfigureWindow( @@ -260,11 +307,10 @@ diff -b -B -u -r1.1.1.1 -r1.3 Index: xserver/hw/wnc/rfbRootless.c =================================================================== RCS file: /cvs/underware/xwnc/xserver/hw/wnc/rfbRootless.c,v -retrieving revision 1.1.1.1 -retrieving revision 1.3 -diff -b -B -u -r1.1.1.1 -r1.3 ---- xwnc/xserver/hw/wnc/rfbRootless.c 26 Aug 2004 14:56:04 -0000 1.1.1.1 -+++ xwnc/xserver/hw/wnc/rfbRootless.c 8 Sep 2004 17:38:38 -0000 1.3 +retrieving revision 1.4 +diff -u -r1.4 rfbRootless.c +--- xwnc/xserver/hw/wnc/rfbRootless.c 27 Mar 2006 14:44:57 -0000 1.4 ++++ xwnc/xserver/hw/wnc/rfbRootless.c 24 Apr 2006 18:17:15 -0000 @@ -322,6 +322,26 @@ return flags; } @@ -369,11 +415,10 @@ diff -b -B -u -r1.1.1.1 -r1.3 Index: xserver/hw/wnc/rfbserver.c =================================================================== RCS file: /cvs/underware/xwnc/xserver/hw/wnc/rfbserver.c,v -retrieving revision 1.1.1.1 -retrieving revision 1.3 -diff -b -B -u -r1.1.1.1 -r1.3 ---- xwnc/xserver/hw/wnc/rfbserver.c 26 Aug 2004 14:56:08 -0000 1.1.1.1 -+++ xwnc/xserver/hw/wnc/rfbserver.c 8 Sep 2004 17:38:38 -0000 1.3 +retrieving revision 1.4 +diff -u -r1.4 rfbserver.c +--- xwnc/xserver/hw/wnc/rfbserver.c 27 Mar 2006 14:44:57 -0000 1.4 ++++ xwnc/xserver/hw/wnc/rfbserver.c 24 Apr 2006 18:17:15 -0000 @@ -960,7 +960,7 @@ void rfbSendConfigureWindow( @@ -395,14 +440,29 @@ diff -b -B -u -r1.1.1.1 -r1.3 if (WriteExact(cl->sock, (char *)&cw, sz_rfbConfigureWindowMsg) < 0) { rfbLogPerror("rfbConfigureWindow: write"); +Index: xserver/hw/wnc/rootlessCommon.h +=================================================================== +RCS file: /cvs/underware/xwnc/xserver/hw/wnc/rootlessCommon.h,v +retrieving revision 1.1.1.1 +diff -u -r1.1.1.1 rootlessCommon.h +--- xwnc/xserver/hw/wnc/rootlessCommon.h 26 Aug 2004 14:56:04 -0000 1.1.1.1 ++++ xwnc/xserver/hw/wnc/rootlessCommon.h 24 Apr 2006 18:17:15 -0000 +@@ -223,7 +223,7 @@ + ((int)(_x) * _pPix->drawable.bitsPerPixel/8 + \ + (int)(_y) * _pPix->devKind); \ + if (_pPix->drawable.bitsPerPixel != FB_UNIT) { \ +- unsigned _diff = ((unsigned) _pPix->devPrivate.ptr) & \ ++ unsigned long int _diff = ((unsigned long int) _pPix->devPrivate.ptr) & \ + (FB_UNIT / CHAR_BIT - 1); \ + _pPix->devPrivate.ptr = (char *) (_pPix->devPrivate.ptr) - \ + _diff; \ Index: xserver/hw/wnc/rootlessScreen.c =================================================================== RCS file: /cvs/underware/xwnc/xserver/hw/wnc/rootlessScreen.c,v -retrieving revision 1.1.1.1 -retrieving revision 1.2 -diff -b -B -u -r1.1.1.1 -r1.2 ---- xwnc/xserver/hw/wnc/rootlessScreen.c 26 Aug 2004 14:56:02 -0000 1.1.1.1 -+++ xwnc/xserver/hw/wnc/rootlessScreen.c 8 Sep 2005 22:20:05 -0000 1.2 +retrieving revision 1.3 +diff -u -r1.3 rootlessScreen.c +--- xwnc/xserver/hw/wnc/rootlessScreen.c 27 Mar 2006 14:44:57 -0000 1.3 ++++ xwnc/xserver/hw/wnc/rootlessScreen.c 24 Apr 2006 18:17:16 -0000 @@ -567,7 +567,7 @@ s = xalloc(sizeof(RootlessScreenRec)); @@ -415,11 +475,10 @@ diff -b -B -u -r1.1.1.1 -r1.2 Index: xserver/hw/wnc/rootlessWindow.c =================================================================== RCS file: /cvs/underware/xwnc/xserver/hw/wnc/rootlessWindow.c,v -retrieving revision 1.1.1.1 -retrieving revision 1.2 -diff -b -B -u -r1.1.1.1 -r1.2 ---- xwnc/xserver/hw/wnc/rootlessWindow.c 26 Aug 2004 14:56:05 -0000 1.1.1.1 -+++ xwnc/xserver/hw/wnc/rootlessWindow.c 8 Sep 2005 22:20:05 -0000 1.2 +retrieving revision 1.3 +diff -u -r1.3 rootlessWindow.c +--- xwnc/xserver/hw/wnc/rootlessWindow.c 27 Mar 2006 14:44:57 -0000 1.3 ++++ xwnc/xserver/hw/wnc/rootlessWindow.c 24 Apr 2006 18:17:16 -0000 @@ -64,7 +64,7 @@ Bool result; RegionRec saveRoot; @@ -470,11 +529,10 @@ diff -b -B -u -r1.1.1.1 -r1.2 Index: xserver/include/servermd.h =================================================================== RCS file: /cvs/underware/xwnc/xserver/include/servermd.h,v -retrieving revision 1.1.1.1 -retrieving revision 1.2 -diff -b -B -u -r1.1.1.1 -r1.2 ---- xwnc/xserver/include/servermd.h 26 Aug 2004 14:57:02 -0000 1.1.1.1 -+++ xwnc/xserver/include/servermd.h 17 Nov 2004 09:24:44 -0000 1.2 +retrieving revision 1.3 +diff -u -r1.3 servermd.h +--- xwnc/xserver/include/servermd.h 27 Mar 2006 14:44:57 -0000 1.3 ++++ xwnc/xserver/include/servermd.h 24 Apr 2006 18:17:16 -0000 @@ -403,7 +403,7 @@ #endif /* ia64 */ diff --git a/xwnc.spec b/xwnc.spec index 311d694..e10b923 100644 --- a/xwnc.spec +++ b/xwnc.spec @@ -1,7 +1,7 @@ Name: xwnc Summary: Mix of Xvnc and XDarwin with improved protocol Version: 0.3.3 -Release: 2%{?dist} +Release: 3%{?dist} License: GPL Group: User Interface/X @@ -10,8 +10,7 @@ Source0: http://download.gna.org/underware/sources/%{name}-%{version}.tar Patch0: xwnc-debian-01.dpatch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: zlib-devel libGL-devel -BuildRequires: autoconf automake libtool +BuildRequires: zlib-devel libGL-devel libtool %description %{summary}. @@ -45,6 +44,10 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Wed Jan 10 2007 Christopher Stone 0.3.3-3 +- Update to latest debian patch +- Remove unneeded BuildRequires + * Wed Jan 10 2007 Christopher Stone 0.3.3-2 - Add NEWS to %%doc - Remove glob from %%files