rpms/xwnc/devel xwnc-debian-01.dpatch, NONE, 1.1 xwnc.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Christopher Stone (xulchris)
fedora-extras-commits at redhat.com
Wed Jan 10 18:41:23 UTC 2007
Author: xulchris
Update of /cvs/extras/rpms/xwnc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv322/devel
Modified Files:
.cvsignore sources
Added Files:
xwnc-debian-01.dpatch xwnc.spec
Log Message:
auto-import xwnc-0.3.3-1 on branch devel from xwnc-0.3.3-1.src.rpm
--- NEW FILE xwnc-debian-01.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
@DPATCH@
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
@@ -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.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 @@
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 +465,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 +480,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 +524,11 @@
# ------------------------------------
+case $host_os in
+ cygwin*)
+ CFLAGS="$CFLAGS -DFD_SETSIZE=256"
+esac
+
AC_OUTPUT([
Makefile
wncauth/Makefile
@@ -548,28 +558,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
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
@@ -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/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
@@ -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.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
@@ -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.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
@@ -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.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
@@ -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/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
@@ -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.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
@@ -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.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
@@ -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)
--- NEW FILE xwnc.spec ---
Name: xwnc
Summary: Mix of Xvnc and XDarwin with improved protocol
Version: 0.3.3
Release: 1%{?dist}
License: GPL
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
BuildRequires: autoconf automake 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
%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
* Wed Jan 10 2007 Christopher Stone <chris.stone at gmail.com> 0.3.3-2
- Add NEWS to %%doc
- Remove glob from %%files
* Mon Jan 08 2007 Christopher Stone <chris.stone at gmail.com> 0.3.3-1
- Initial Fedora release
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xwnc/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 10 Jan 2007 18:39:57 -0000 1.1
+++ .cvsignore 10 Jan 2007 18:40:53 -0000 1.2
@@ -0,0 +1 @@
+xwnc-0.3.3.tar.gz
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xwnc/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 10 Jan 2007 18:39:57 -0000 1.1
+++ sources 10 Jan 2007 18:40:53 -0000 1.2
@@ -0,0 +1 @@
+be38eb400d9e3fac38b3ce34250cf54e xwnc-0.3.3.tar.gz
More information about the scm-commits
mailing list