From 395f5dcea35f61ca3e020edabcee09482e7fb406 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Fri, 7 Nov 2008 04:10:55 +0000 Subject: [PATCH 1/8] Initialize branch F-10 for xwnc --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..dc32377 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-10 From c6284777cc2363fae3793d08f24ef5c84c865c2f Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Thu, 26 Feb 2009 12:16:27 +0000 Subject: [PATCH 2/8] - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild --- xwnc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xwnc.spec b/xwnc.spec index 5a9157e..19b107f 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: 6%{?dist} +Release: 7%{?dist} License: GPLv2+ Group: User Interface/X @@ -44,6 +44,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Thu Feb 26 2009 Fedora Release Engineering - 0.3.3-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + * Tue Jul 08 2008 Christopher Stone 0.3.3-6 - Try linking with -Wl,--export-dynamic. From 776ae13199776a0a5adb88f4e6b3029ea1a95147 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Mon, 27 Jul 2009 08:48:39 +0000 Subject: [PATCH 3/8] - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild --- xwnc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xwnc.spec b/xwnc.spec index 19b107f..31fce2d 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: 7%{?dist} +Release: 8%{?dist} License: GPLv2+ Group: User Interface/X @@ -44,6 +44,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon Jul 27 2009 Fedora Release Engineering - 0.3.3-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + * Thu Feb 26 2009 Fedora Release Engineering - 0.3.3-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From 9871c7b4be99683f524ed0ac282775de4c593bc4 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Wed, 25 Nov 2009 22:41:08 +0000 Subject: [PATCH 4/8] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 9083fd6..17f7b5b 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ # Makefile for source rpm: xwnc -# $Id$ +# $Id: Makefile,v 1.1 2007/01/10 18:39:57 xulchris Exp $ 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 +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From a6ac665a492538acae90e36afa78585708c41adf Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:39:43 +0000 Subject: [PATCH 5/8] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 9083fd6..46e7958 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ 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 +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From 12cbcc646080300e70883a3087779d515204b562 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 16:17:01 +0000 Subject: [PATCH 6/8] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- 2 files changed, 21 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile 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 17f7b5b..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: xwnc -# $Id: Makefile,v 1.1 2007/01/10 18:39:57 xulchris Exp $ -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 $$d/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) From 0e892d82e4456ed7cc92a86f546c404a8649d65d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 16:17:01 +0000 Subject: [PATCH 7/8] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - 3 files changed, 22 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch 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 46e7958..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 $$d/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/branch b/branch deleted file mode 100644 index dc32377..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-10 From a919e8f401ee8f00bc3a7d533705e32c00827630 Mon Sep 17 00:00:00 2001 From: Till Maas Date: Wed, 4 Jun 2014 20:16:47 +0200 Subject: [PATCH 8/8] 2014-06-04 - This package was already retired in pkgdb/blocked in koji, but no dead.package file existed. The original retirement reason is unclear. --- .gitignore | 1 - dead.package | 1 + sources | 1 - xwnc-debian-01.dpatch | 544 ------------------------------------------ xwnc.spec | 71 ------ 5 files changed, 1 insertion(+), 617 deletions(-) delete mode 100644 .gitignore create mode 100644 dead.package delete mode 100644 sources delete mode 100644 xwnc-debian-01.dpatch delete mode 100644 xwnc.spec diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 3a50bd2..0000000 --- a/.gitignore +++ /dev/null @@ -1 +0,0 @@ -xwnc-0.3.3.tar.gz diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..5784d07 --- /dev/null +++ b/dead.package @@ -0,0 +1 @@ +2014-06-04 - This package was already retired in pkgdb/blocked in koji, but no dead.package file existed. The original retirement reason is unclear. diff --git a/sources b/sources deleted file mode 100644 index c7d11dc..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -be38eb400d9e3fac38b3ce34250cf54e xwnc-0.3.3.tar.gz diff --git a/xwnc-debian-01.dpatch b/xwnc-debian-01.dpatch deleted file mode 100644 index 604d1eb..0000000 --- a/xwnc-debian-01.dpatch +++ /dev/null @@ -1,544 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run - -@DPATCH@ -Index: Makefile.am -=================================================================== -RCS file: /cvs/underware/xwnc/Makefile.am,v -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 -+MAINTAINERCLEANFILES = \ -+ INSTALL \ -+ Makefile.in \ -+ aclocal.m4 \ -+ config.guess \ -+ config.h.in \ -+ config.sub \ -+ configure \ -+ depcomp \ -+ install-sh \ -+ missing \ -+ mkinstalldirs \ -+ Makefile.in \ -+ compile \ -+ ltmain.sh \ -+ xserver/fb/Makefile.in \ -+ xserver/hw/wnc/Makefile.in \ -+ xserver/hw/Makefile.in \ -+ xserver/mi/Makefile.in \ -+ xserver/os/Makefile.in \ -+ xserver/dix/Makefile.in \ -+ xserver/Xext/Makefile.in \ -+ xserver/Makefile.in \ -+ xserver/render/Makefile.in \ -+ xserver/include/Makefile.in \ -+ xserver/GL/glx/Makefile.in \ -+ xserver/GL/mesa/Makefile.in \ -+ xserver/GL/Makefile.in \ -+ xserver/dbe/Makefile.in \ -+ xserver/record/Makefile.in \ -+ xserver/xfixes/Makefile.in \ -+ xlibs/Xau/Makefile.in \ -+ xlibs/Xdmcp/Makefile.in \ -+ xlibs/Xfont/fc/Makefile.in \ -+ xlibs/Xfont/util/Makefile.in \ -+ xlibs/Xfont/stubs/Makefile.in \ -+ xlibs/Xfont/FreeType/Makefile.in \ -+ xlibs/Xfont/fontfile/Makefile.in \ -+ xlibs/Xfont/bitmap/Makefile.in \ -+ xlibs/Xfont/Makefile.in \ -+ xlibs/Xfont/builtins/Makefile.in \ -+ xlibs/Makefile.in \ -+ wncauth/Makefile.in -+ -+DISTCLEANFILES = \ -+ config.log \ -+ config.status - -- --SUBDIRS = doc -- --if HAVE_FVWM --SUBDIRS += fvwm-insitu --endif -- --SUBDIRS += wncauth xlibs xserver bin -- --if HAVE_FVWMAMETISTA --SUBDIRS += FvwmAmetista --endif -- --SUBDIRS += rpm -- --## --------------------------------------------------------------------------- --## Produce an rpm package using dist or from the given tarball --## (requires rpmbuild in your system) --# Usage: --# make rpm-dist --# make release=1 rpm-dist --# make rpm-this --# make version=2.3.22 release=2 rpm-this --# make rpm-dist cparams='--enable-multibyte --quiet' mparams='CFLAGS="-O2 -g"' -- --# automatical regeneration is missing for other dirs, so do it explicitly --rpm-regenerate: -- (cd rpm && $(MAKE) $(AM_MAKEFLAGS) Makefile *.spec) || exit 1 -- --rpm-dist: dist rpm-this -- --rpm-this: rpm-regenerate -- (cd rpm && $(MAKE) $(AM_MAKEFLAGS) this) || exit 1 -- -+SUBDIRS = wncauth xlibs xserver -Index: configure.ac -=================================================================== -RCS file: /cvs/underware/xwnc/configure.ac,v -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 - --with_FvwmAmetista=yes -+AC_ARG_WITH( fvwm-ametista, -+ AS_HELP_STRING( [--without-fvwm-ametista], -+ [Dont build Fvwm Ametista]), -+ with_FvwmAmetista=$withval, -+ with_FvwmAmetista=yes) -+ - FvwmAmetista_failure= - NUCLEO_CPPFLAGS= - NUCLEO_LDFLAGS= -@@ -460,9 +471,7 @@ - with_FvwmAmetista=no - FvwmAmetista_failure="fvwm-insitu source code not found" - fi --fi - --if test x"$with_FvwmAmetista" = x"yes"; then - # ametista - NUCLEO_CPPFLAGS="`nucleo-config --cppflags`" - NUCLEO_LDFLAGS="`nucleo-config --ldflags`" -@@ -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" -+elif test "$FvwmAmetista_failure" = ""; then -+ FvwmAmetista_failure="disabled by user" - fi - - -@@ -519,6 +530,11 @@ - - # ------------------------------------ - -+case $host_os in -+ cygwin*) -+ CFLAGS="$CFLAGS -DFD_SETSIZE=256" -+esac -+ - AC_OUTPUT([ - Makefile - wncauth/Makefile -@@ -548,28 +564,6 @@ - xserver/GL/mesa/Makefile - xserver/hw/Makefile - xserver/hw/wnc/Makefile --FvwmAmetista/Makefile --FvwmAmetista/wncdesktop/Makefile --FvwmAmetista/fvwmmodule/Makefile --FvwmAmetista/wstyle/Makefile --FvwmAmetista/texture/Makefile --FvwmAmetista/main/Makefile --FvwmAmetista/config/Makefile --FvwmAmetista/config/fvwm2rc --FvwmAmetista/config/ametistarc --FvwmAmetista/config/colours/Makefile --FvwmAmetista/config/window/Makefile --FvwmAmetista/images/Makefile --FvwmAmetista/images/16x16/Makefile --FvwmAmetista/images/cursors/Makefile --FvwmAmetista/images/buttons/Makefile --FvwmAmetista/images/buttons/redmond/Makefile --bin/Makefile --bin/metisse-start-fvwm --doc/Makefile --doc/images/Makefile --rpm/Makefile --rpm/metisse.spec - ]) - - dnl xserver/miext/Makefile -Index: wncauth/wncproto.h -=================================================================== -RCS file: /cvs/underware/xwnc/wncauth/wncproto.h,v -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 - - */ - -+typedef char rfbConfigureWindowProperty[64]; -+ - typedef struct { - CARD8 type; /* always rfbConfigureWindow */ -- CARD8 pad1; -+ CARD8 isroot; /* root window : 1, not root window : 0 */ - CARD16 pad2; - CARD32 window; /* window id */ - CARD16 xsgn; /* 0: negative, 1: positive */ -@@ -752,9 +754,10 @@ - CARD16 y; /* position */ - CARD32 width; /* size of the window */ - CARD32 height; -+ rfbConfigureWindowProperty window_name; - } rfbConfigureWindowMsg; - --#define sz_rfbConfigureWindowMsg 24 -+#define sz_rfbConfigureWindowMsg (24 + sizeof (rfbConfigureWindowProperty)) - - /*----------------------------------------------------------------------------- - * 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.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; - -- CURSOR_PRIV(pScreen) = ScreenPriv; -+ pScreen->devPrivates[rfbCursorScreenIndex].ptr = ScreenPriv; - - /* override some screen procedures */ - ScreenPriv->QueryBestSize = pScreen->QueryBestSize; -Index: xserver/hw/wnc/rfb.h -=================================================================== -RCS file: /cvs/underware/xwnc/xserver/hw/wnc/rfb.h,v -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( - unsigned long window, int x, int y, unsigned int width, -- unsigned int height); -+ unsigned int height, int isroot, const char* window_name); - void rfbSendDestroyWindow(unsigned long window); - void rfbSendUnmapWindow(unsigned long window); - void rfbSendRestackWindow( -Index: xserver/hw/wnc/rfbRootless.c -=================================================================== -RCS file: /cvs/underware/xwnc/xserver/hw/wnc/rfbRootless.c,v -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; - } - -+/**************************************************************************/ -+ -+static const char* find_wm_name(RootlessWindowPtr frame, char* buffer) -+{ -+ PropertyPtr p = frame->win->optional->userProps; -+ while (p) -+ if (p->propertyName == XA_WM_NAME) -+ break; -+ else -+ p = p->next; -+ if (p) -+ { -+ int size = MIN(sizeof (rfbConfigureWindowProperty) - 1, p->size); -+ memcpy(buffer, p->data, size), buffer[p->size] = 0; -+ } -+ else -+ memcpy(buffer, "", sizeof ("")); -+ return buffer; -+} -+ - /* ************************************************************************** - * - * -@@ -885,11 +905,15 @@ - REGION_UNION( - pScreen,&c->modifiedRegion, - &c->modifiedRegion, ®); -- rfbSendConfigureWindow( -- w->frame->win->drawable.id, -+ { -+ char buffer[sizeof (rfbConfigureWindowProperty)]; -+ rfbSendConfigureWindow(w->frame->win->drawable.id, - w->frame->x, w->frame->y, - w->frame->width, -- w->frame->height); -+ w->frame->height, -+ IsRoot(w->frame->win), -+ find_wm_name(w->frame, buffer)); -+ } - if (REGION_NOTEMPTY(pScreen,&w->bShape)) - { - c->shapeChanged = 1; -@@ -947,10 +971,14 @@ - pFrame->win->drawable.width, pFrame->win->drawable.height, - (rw->pixelData)? rw->pixelData:0); - #endif -- -- rfbSendConfigureWindow( -- pFrame->win->drawable.id, newX, newY, pFrame->width, -- pFrame->height); -+ { -+ char buffer[sizeof (rfbConfigureWindowProperty)]; -+ rfbSendConfigureWindow(pFrame->win->drawable.id, -+ newX, newY, -+ pFrame->width, pFrame->height, -+ IsRoot(pFrame->win), -+ find_wm_name(pFrame, buffer)); -+ } - - REGION_INIT(pScreen,&rw->bShape,NullBox,0); - if (pShape) -@@ -999,10 +1027,14 @@ - newX, newY, rw->frame->width, rw->frame->height); - #endif - -- rfbSendConfigureWindow( -- rw->frame->win->drawable.id, newX, newY, rw->frame->width, -- rw->frame->height); -- -+ { -+ char buffer[sizeof (rfbConfigureWindowProperty)]; -+ rfbSendConfigureWindow(rw->frame->win->drawable.id, -+ newX, newY, -+ rw->frame->width, rw->frame->height, -+ IsRoot(rw->frame->win), -+ find_wm_name(rw->frame, buffer)); -+ } - } - - #define DEBUG_rfbRestackFrame 0 -@@ -1075,8 +1107,14 @@ - rw->frame->win->drawable.width, rw->frame->win->drawable.height, - (long unsigned)rw->pixelData); - #endif -- rfbSendConfigureWindow( -- rw->frame->win->drawable.id, newX, newY, newW, newH); -+ { -+ char buffer[sizeof (rfbConfigureWindowProperty)]; -+ rfbSendConfigureWindow(rw->frame->win->drawable.id, -+ newX, newY, -+ newW, newH, -+ IsRoot(rw->frame->win), -+ find_wm_name(rw->frame, buffer)); -+ } - - for (cl = rfbClientHead; cl; cl = cl->next) - { -Index: xserver/hw/wnc/rfbserver.c -=================================================================== -RCS file: /cvs/underware/xwnc/xserver/hw/wnc/rfbserver.c,v -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( - unsigned long window, int x, int y, unsigned int width, -- unsigned int height) -+ unsigned int height, int isroot, const char* window_name) - { - rfbClientPtr cl, nextCl; - rfbConfigureWindowMsg cw; -@@ -991,9 +991,10 @@ - } - cw.width = Swap32IfLE(width); - cw.height = Swap32IfLE(height); -+ cw.isroot = isroot; - /* for valgrind */ -- cw.pad1 = 0; - cw.pad2 = 0; -+ strncpy(cw.window_name, window_name, sizeof (rfbConfigureWindowProperty)); - 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.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)); - if (! s) return FALSE; -- SCREENREC(pScreen) = s; -+ pScreen->devPrivates[rootlessScreenPrivateIndex].ptr = s; - - s->pixmap_data = NULL; - s->pixmap_data_size = 0; -Index: xserver/hw/wnc/rootlessWindow.c -=================================================================== -RCS file: /cvs/underware/xwnc/xserver/hw/wnc/rootlessWindow.c,v -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; - -- WINREC(pWin) = NULL; -+ pWin->devPrivates[rootlessWindowPrivateIndex].ptr = NULL; - - SCREEN_UNWRAP(pWin->drawable.pScreen, CreateWindow); - -@@ -105,7 +105,7 @@ - #endif - - xfree(winRec); -- WINREC(pWin) = NULL; -+ pWin->devPrivates[rootlessWindowPrivateIndex].ptr = NULL; - } - - -@@ -349,7 +349,7 @@ - winRec->pixmap = NULL; - winRec->wid = NULL; - -- WINREC(pWin) = winRec; -+ pWin->devPrivates[rootlessWindowPrivateIndex].ptr = winRec; - - #ifdef SHAPE - // Set the frame's shape if the window is shaped -@@ -366,7 +366,7 @@ - { - RL_DEBUG_MSG("implementation failed to create frame!\n"); - xfree(winRec); -- WINREC(pWin) = NULL; -+ pWin->devPrivates[rootlessWindowPrivateIndex].ptr = NULL; - return NULL; - } - -@@ -1261,8 +1261,8 @@ - - /* Switch the frame record from one to the other. */ - -- WINREC(pWin) = NULL; -- WINREC(pTopWin) = winRec; -+ pWin->devPrivates[rootlessWindowPrivateIndex].ptr = NULL; -+ pTopWin->devPrivates[rootlessWindowPrivateIndex].ptr = winRec; - - RootlessInitializeFrame(pTopWin, winRec); - RootlessReshapeFrame(pTopWin); -Index: xserver/include/servermd.h -=================================================================== -RCS file: /cvs/underware/xwnc/xserver/include/servermd.h,v -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 */ - --#if defined(__AMD64__) || defined(AMD64) -+#if defined(__x86_64__) - # define IMAGE_BYTE_ORDER LSBFirst - - # if defined(XF86MONOVGA) || defined(XF86VGA16) || defined(XF86MONO) diff --git a/xwnc.spec b/xwnc.spec deleted file mode 100644 index 31fce2d..0000000 --- a/xwnc.spec +++ /dev/null @@ -1,71 +0,0 @@ -Name: xwnc -Summary: Mix of Xvnc and XDarwin with improved protocol -Version: 0.3.3 -Release: 8%{?dist} - -License: GPLv2+ -Group: User Interface/X -URL: http://insitu.lri.fr/~chapuis/metisse/download_install.html -Source0: http://download.gna.org/underware/sources/%{name}-%{version}.tar.gz -Patch0: xwnc-debian-01.dpatch -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -BuildRequires: zlib-devel libGL-devel libtool - -%description -%{summary}. - - -%prep -%setup -q -%patch0 -p1 -b .debian~ -autoreconf --force --install - - -%build -%configure --without-fvwm-ametista --disable-glx -# does not build correctly with SMP flags -make LDFLAGS=-Wl,--export-dynamic - - -%install -rm -rf $RPM_BUILD_ROOT -make install DESTDIR=$RPM_BUILD_ROOT - - -%clean -rm -rf $RPM_BUILD_ROOT - - -%files -%defattr(-,root,root,-) -%doc AUTHORS ChangeLog COPYING NEWS -%{_bindir}/Xwnc - - -%changelog -* Mon Jul 27 2009 Fedora Release Engineering - 0.3.3-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild - -* Thu Feb 26 2009 Fedora Release Engineering - 0.3.3-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild - -* Tue Jul 08 2008 Christopher Stone 0.3.3-6 -- Try linking with -Wl,--export-dynamic. - -* Thu Jul 03 2008 Christopher Stone 0.3.3-5 -- Rebuild for new Mesa - -* Wed Feb 20 2008 Fedora Release Engineering 0.3.3-4 -- Autorebuild for GCC 4.3 - -* 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 - -* Mon Jan 08 2007 Christopher Stone 0.3.3-1 -- Initial Fedora release