--- pixmap-2.6pl4.orig/SelFile/Draw.c +++ pixmap-2.6pl4/SelFile/Draw.c @@ -508,7 +508,7 @@ if (SFbuttonPressed) { SFscrollTimerId = XtAppAddTimeOut(SFapp, - SFscrollTimerInterval(), SFscrollTimer, (XtPointer) n); + SFscrollTimerInterval(), SFscrollTimer, (XtPointer)(long)n); } } @@ -549,7 +549,7 @@ SFscrollTimerAdded = 1; SFscrollTimerId = XtAppAddTimeOut(SFapp, SFscrollTimerInterval(), SFscrollTimer, - (XtPointer) n); + (XtPointer)(long)n); } } --- pixmap-2.6pl4.orig/SelFile/SelFile.c +++ pixmap-2.6pl4/SelFile/SelFile.c @@ -41,12 +41,18 @@ * Tokyo 102 Japan. TEL +81-3-234-2692 */ +#define USE_STRERROR + #include #include /* BSD 4.3 errno.h does not declare errno */ extern int errno; +#ifdef USE_STRERROR +#include +#else extern int sys_nerr; -extern char *sys_errlist[]; +/*extern char *sys_errlist[];*/ +#endif #include #include @@ -65,7 +71,7 @@ #define MAXPATHLEN 1024 #endif /* ndef MAXPATHLEN */ -#if !defined(SVR4) && !defined(SYSV) && !defined(USG) +#if !defined(SVR4) && !defined(SYSV) && !defined(USG) && !defined(linux) extern char *getwd(); #endif /* !defined(SVR4) && !defined(SYSV) && !defined(USG) */ @@ -413,9 +419,9 @@ scrollbarWidgetClass, selFileLists[n], arglist, i); XtAddCallback(selFileVScrolls[n], XtNjumpProc, - SFvFloatSliderMovedCallback, (XtPointer) n); + SFvFloatSliderMovedCallback, (XtPointer)(long)n); XtAddCallback(selFileVScrolls[n], XtNscrollProc, - SFvAreaSelectedCallback, (XtPointer) n); + SFvAreaSelectedCallback, (XtPointer)(long)n); i = 0; @@ -430,9 +436,9 @@ scrollbarWidgetClass, selFileLists[n], arglist, i); XtAddCallback(selFileHScrolls[n], XtNjumpProc, - SFhSliderMovedCallback, (XtPointer) n); + SFhSliderMovedCallback, (XtPointer)(long)n); XtAddCallback(selFileHScrolls[n], XtNscrollProc, - SFhAreaSelectedCallback, (XtPointer) n); + SFhAreaSelectedCallback, (XtPointer)(long)n); } i = 0; @@ -491,17 +497,17 @@ for (n = 0; n < 3; n++) { XtAddEventHandler(selFileLists[n], ExposureMask, True, - SFexposeList, (XtPointer) n); + SFexposeList, (XtPointer)(long)n); XtAddEventHandler(selFileLists[n], EnterWindowMask, False, - SFenterList, (XtPointer) n); + SFenterList, (XtPointer)(long)n); XtAddEventHandler(selFileLists[n], LeaveWindowMask, False, - SFleaveList, (XtPointer) n); + SFleaveList, (XtPointer)(long)n); XtAddEventHandler(selFileLists[n], PointerMotionMask, False, - SFmotionList, (XtPointer) n); + SFmotionList, (XtPointer)(long)n); XtAddEventHandler(selFileLists[n], ButtonPressMask, False, - SFbuttonPressList, (XtPointer) n); + SFbuttonPressList, (XtPointer)(long)n); XtAddEventHandler(selFileLists[n], ButtonReleaseMask, False, - SFbuttonReleaseList, (XtPointer) n); + SFbuttonReleaseList, (XtPointer)(long)n); } XtAddEventHandler(selFileField, KeyPressMask, False, @@ -562,19 +568,21 @@ SFchdir(SFstartDir); if ((fp = fopen(name, mode)) == NULL) { char *buf; - if (errno <= sys_nerr) { - buf = XtMalloc(strlen(failed) + strlen(sys_errlist[errno]) + - strlen(prompt) + 2); - strcpy(buf, failed); - strcat(buf, sys_errlist[errno]); - strcat(buf, "\n"); - strcat(buf, prompt); - } else { - buf = XtMalloc(strlen(failed) + strlen(prompt) + 2); - strcpy(buf, failed); - strcat(buf, "\n"); - strcat(buf, prompt); - } + char *syserrstring; +#ifdef USE_STRERROR + syserrstring = strerror(errno); +#else + if (errno <= sys_nerr) + syserrstring = sys_errlist[errno]; + else + syserrstring = ""; +#endif + buf = XtMalloc(strlen(failed) + strlen(syserrstring) + + strlen(prompt) + 2); + strcpy(buf, failed); + strcat(buf, syserrstring); + strcat(buf, "\n"); + strcat(buf, prompt); XtSetArg(args[0], XtNlabel, buf); XtSetValues(selFilePrompt, args, 1); XtFree(buf); @@ -680,7 +688,7 @@ SFpositionWidget(selFile); XtMapWidget(selFile); -#if defined(SVR4) || defined(SYSV) || defined(USG) +#if defined(SVR4) || defined(SYSV) || defined(USG) || defined(linux) if (!getcwd(SFstartDir, MAXPATHLEN)) { #else /* defined(SVR4) || defined(SYSV) || defined(USG) */ if (!getwd(SFstartDir)) { --- pixmap-2.6pl4.orig/debian/prerm +++ pixmap-2.6pl4/debian/prerm @@ -0,0 +1,4 @@ +#!/bin/sh -e +if [ \( "$1" = "upgrade" -o "$1" = "remove" \) -a -h /usr/doc/pixmap ]; then + rm -f /usr/doc/pixmap +fi --- pixmap-2.6pl4.orig/debian/conffiles +++ pixmap-2.6pl4/debian/conffiles @@ -0,0 +1,2 @@ +/etc/X11/app-defaults/Pixmap +/etc/X11/app-defaults/Pixmap-color --- pixmap-2.6pl4.orig/debian/postinst +++ pixmap-2.6pl4/debian/postinst @@ -0,0 +1,5 @@ +#!/bin/sh -e + +[ $1 = configure ] || exit 0 + +if [ -x /usr/bin/update-menus ] ; then update-menus ; fi --- pixmap-2.6pl4.orig/debian/copyright +++ pixmap-2.6pl4/debian/copyright @@ -0,0 +1,35 @@ +This is the Debian GNU/Linux prepackaged version of Pixmap, a pixmap +editor. + +This package was put together by Ian Murdock , +from sources obtained from: + ftp.x.org:/contrib/applications/pixmap/pixmap2.6.tar.gz + +Changes: + * added Debian GNU/Linux package maintenance system files + +Copyright (c) 1991-1994 Lionel MALLET + +Permission is hereby granted, free of charge, to any person obtaining +a copy of this software and associated documentation files (the +"Software"), to deal in the Software without restriction, including +without limitation the rights to use, copy, modify, merge, publish, +distribute, sublicense, and/or sell copies of the Software, and to +permit persons to whom the Software is furnished to do so, subject to +the following conditions: + +The above copyright notice and this permission notice shall be included +in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS +OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +IN NO EVENT SHALL Lionel MALLET BE LIABLE FOR ANY CLAIM, DAMAGES OR +OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, +ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR +OTHER DEALINGS IN THE SOFTWARE. + +Except as contained in this notice, the name of Lionel MALLET shall +not be used in advertising or otherwise to promote the sale, use or +other dealings in this Software without prior written authorization +from Lionel MALLET. --- pixmap-2.6pl4.orig/debian/postrm +++ pixmap-2.6pl4/debian/postrm @@ -0,0 +1,3 @@ +#!/bin/bash -e + +if [ -x /usr/bin/update-menus ] ; then update-menus ; fi --- pixmap-2.6pl4.orig/debian/changelog +++ pixmap-2.6pl4/debian/changelog @@ -0,0 +1,179 @@ +pixmap (2.6pl4-18) unstable; urgency=low + + * really handle nostrip build option now, thanks to patch from Cesare + Tirabassi from Ubuntu. + closes:#491561 + * Removed hack for getenv(), as it now seems to work, at least with stdlib.h + * included (also thanks to Cesare Tirabassi). + + -- Paul Slootman Tue, 22 Jul 2008 10:35:14 +0200 + +pixmap (2.6pl4-17) unstable; urgency=low + + * Build depend on xbitmaps, which provides /usr/include/X11/bitmaps/xlogo16 + + -- Paul Slootman Mon, 02 Jun 2008 19:14:19 +0200 + +pixmap (2.6pl4-16) unstable; urgency=low + + * The shipped Makefile doesn't contain a distclean target, while the + generated version does. Hence first try make distclean in clean target, + else fallback to make clean. + closes:#484044 + + -- Paul Slootman Mon, 02 Jun 2008 12:28:26 +0200 + +pixmap (2.6pl4-15) unstable; urgency=low + + * Acknowledge previous NMUs, thanks! + closes:#355450,#366867 + * Don't install to /usr/lib/X11/, and don't refer to /usr/X11R6/include/. + * Updated standards version to 3.7.3.0. + * Remove build-dependency on xlibs-data. + closes:#419018 + * Also cleaned up build-dependencies some more. + * Add (dummy) binary-indep target in debian/rules. + closes:#395735 + * Handle nostrip build option. + closes:#437775 + + -- Paul Slootman Fri, 30 May 2008 17:26:26 +0200 + +pixmap (2.6pl4-14.2) unstable; urgency=high + + * Non-maintainer upload. + * High-urgency upload for RC bugfix. + * Xorg7 migration (Closes: #365260): + - Build-depend on xutils-dev for FHS-compliant xmkmf. + - Pre-depend on x11-common (>= 1:7.0.0) to get /usr/lib/X11 as a + directory instead of a symlink. + - Fix Pixmap.h to include instead of the broken "xpm.h". + - Fix up all paths under debian/ to use the FHS paths instead of + /usr/X11R6 + - Look for rgb.txt in $(CONFDIR) instead of $(LIBDIR) + + -- Luk Claes Wed, 10 May 2006 00:46:58 +0200 + +pixmap (2.6pl4-14.1) unstable; urgency=high + + * Non-maintainer upload. + * Update xlibs-dev build-dep (Closes: #347095). + * Remove X11 dir in build target (Closes: #349443). + + -- Luk Claes Sun, 5 Mar 2006 19:37:51 +0100 + +pixmap (2.6pl4-14) unstable; urgency=low + + * Removed libxaw-dev from Build-Depends; replaced with libxaw7-dev. + closes:#169981 + * Updated location of app-defaults file in manpage. + * Made default font a little smaller in the app-defaults file. + + -- Paul Slootman Fri, 9 Jan 2004 09:11:52 +0100 + +pixmap (2.6pl4-13) unstable; urgency=low + + * Actually put the the list of conffiles in the package. closes:#132187 + * Apparently install -s does a different strip than when linking with -s + (.code and .comment fields were left behind). + * Added -isp to dpkg-gencontrol to include the section and priority. + + -- Paul Slootman Fri, 15 Feb 2002 10:22:36 +0100 + +pixmap (2.6pl4-12) unstable; urgency=low + + * Hacked around HP_Architecture test in Imakefile, which is only for HPUX + closes:#104715 + * Made the long description actually useful. closes:#93824 + + -- Paul Slootman Mon, 23 Jul 2001 19:31:51 +0200 + +pixmap (2.6pl4-11) unstable; urgency=low + + * Added libxaw-dev to Build-Depends. closes:#86595 + + -- Paul Slootman Mon, 19 Feb 2001 21:34:59 +0100 + +pixmap (2.6pl4-10) unstable; urgency=low + + * Listed the app-defaults files as conffiles (as they're under /etc now) + * changed section to graphics to agree with the overrides + + -- Paul Slootman Fri, 16 Feb 2001 11:57:57 +0100 + +pixmap (2.6pl4-9) unstable; urgency=low + + * Updated Standards-Version to 3.5.0. + * As a consequence, moved app-defaults file to /etc/X11/app-defaults + * Added menu hint, closes:#80158 + + -- Paul Slootman Thu, 15 Feb 2001 14:17:39 +0100 + +pixmap (2.6pl4-8) unstable; urgency=low + + * Updated Standards-Version to 3.0.1. + + -- Paul Slootman Thu, 28 Oct 1999 17:07:27 +0200 + +pixmap (2.6pl4-7) unstable; urgency=low + + * Forgot to change debian/control to reflect new maintainer :-( + * now lintian-clean. + + -- Paul Slootman Tue, 5 Jan 1999 17:38:29 +0100 + +pixmap (2.6pl4-6) unstable; urgency=low + + * New maintainer. + * remove debian/files, debian/substvars in clean target (common packaging + error number 3). See bug #28163 + * Change the order of a couple of lines in debian/control to something more + usual. See bug #22653, 28269 + * Don't compress the copyright file. fixes:#14494 + * Don't use getwd() on Linux (use getcwd() instead) + * Fixed a couple of warnings (on Alpha) + * The following bugs seem to have already been fixed, but not yet closed in + the BTS: 12928, 14935, 27849 + + -- Paul Slootman Tue, 15 Dec 1998 10:07:26 +0100 + +pixmap (2.6pl4-5) unstable; urgency=low + + * Added color app-defaults file, fixes: 27849. + app-defauls file copied from Branden Robinson's bugreport. + + -- joost witteveen Fri, 16 Oct 1998 17:20:44 +0200 + +pixmap (2.6pl4-4) unstable; urgency=low + + * Non-maintainer libc6 release. + * Selfile/Selfil.c: comment out sys_errlist declararation. + * debian/control: don't hardcode xpm4.7 dependancy anymore. + + -- Joey Hess Sun, 16 Nov 1997 01:05:13 -0500 + +pixmap (2.6pl4-3) unstable; urgency=low + + * Recompiled with correct version of X packages installed, no -rpath any + more. + + -- joost witteveen Fri, 7 Feb 1997 15:35:15 +0100 + +pixmap (2.6pl4-2) unstable; urgency=low + + * Registers menu entry with debian menu's + * Added changelog.Debian + * Added upstream changelog, even though it's ages old, but it should + keep the bug-scripts happy. + * stripped executable. + + -- joost witteveen Wed, 1 Jan 1997 21:14:27 +0100 + +pixmap (2.6pl4-1) unstable; urgency=low + + * new source packaging. + * upgraded to upstream version (although previous (2.6.pl2-5) version + had most of the patches 2.6.pl4 already in. + + -- joost witteveen Sat, 26 Oct 1996 13:33:28 +0200 + --- pixmap-2.6pl4.orig/debian/menu +++ pixmap-2.6pl4/debian/menu @@ -0,0 +1,6 @@ +?package(pixmap):needs="X11" title="Pixmap" section="Applications/Graphics" \ + hints="Bitmap" \ + longtitle="Pixmap editor"\ + description="Pixmap has functionality similar to that of Bitmap, a bitmap editor,\ + which comes as standard with the X Window System."\ + command="/usr/bin/pixmap" --- pixmap-2.6pl4.orig/debian/control +++ pixmap-2.6pl4/debian/control @@ -0,0 +1,17 @@ +Source: pixmap +Section: graphics +Priority: optional +Maintainer: Paul Slootman +Standards-Version: 3.7.3.0 +Build-Depends: xutils-dev, libxaw7-dev, xbitmaps + +Package: pixmap +Depends: ${shlibs:Depends} +Pre-Depends: x11-common (>= 1:7.0.0) +Architecture: any +Description: A pixmap editor + Pixmap is a tool for creating or editing rectangular images made up of colored + pixels, i.e., pixmaps. Pixmaps are intensively used in X to define window + backgrounds, icon images, etc. These are for example used as icons on the + desktop or in the Debian menu. + --- pixmap-2.6pl4.orig/debian/rules +++ pixmap-2.6pl4/debian/rules @@ -0,0 +1,113 @@ +#! /usr/bin/make -f +# +# To make the binary distribution package, the ``Debianized'' source package +# and the context diff to the original package, type `./debian.rules dist'. +# Make sure that `debian.rules' is executable before the final distribution +# is made. +# +# Invoke each target with `./debian.rules '. All targets should be +# invoked with the package root as the current directory. +# +# The `binary' target must be run as root, as it needs to install files with +# specific ownerships. The `diff' target assumes that you have the original +# source package available, unpacked, in ../$(p)-$(v).orig, or that you have +# the previous revision of the ``Debianized'' source package and context diff +# in the parent directory. + +CC = gcc +# CFLAGS = -O2 -g # doesn't do much good with Imakefile etc... + +# The name of the package +p = pixmap + +package=$(p) + +build: +# Builds the binary package. + rm -rf X11 + xmkmf + rm -f clean + make Makefiles + perl -i -pe 's/ ..SMLIB. ..ICELIB.//' Makefile # don't link with -lSM -lICE + make + touch stamp-build + +clean: +# Undoes the effect of `make -f debian.rules build'. + [ ! -f Makefile ] || $(MAKE) distclean || $(MAKE) clean + touch clean + rm -f Makefile Makefile.bak SelFile/Makefile dotpixmap .#pixmap + rm -f stamp-build + rm -rf debian/tmp debian/files debian/substvars + +binary-arch: checkroot build +# Makes a binary package. + test -f stamp-build || make -f debian.rules build + install -d -g root -m 755 -o root debian/tmp + chmod g-s debian/tmp + install -d -g root -m 755 -o root \ + debian/tmp/DEBIAN \ + debian/tmp/usr/bin \ + debian/tmp/usr/lib/X11 \ + debian/tmp/usr/lib/X11/Pixmap \ + debian/tmp/usr/share/doc/$(p) \ + debian/tmp/usr/share/menu \ + debian/tmp/usr/share/man/man1 \ + debian/tmp/etc/X11/app-defaults +ifneq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS))) + install -g root -m 755 -o root pixmap debian/tmp/usr/bin/pixmap +else + # see changelog entry for 2.6pl4-13 about the strip here + strip pixmap + install -g root -m 755 -o root -s pixmap debian/tmp/usr/bin/pixmap +endif + install -g root -m 644 -o root Pixmap.ad \ + debian/tmp/etc/X11/app-defaults/Pixmap + install -g root -m 644 -o root Pixmap-color \ + debian/tmp/etc/X11/app-defaults/Pixmap-color + for file in Down Excl FlipHoriz FlipVert Fold Left Right RotateLeft \ + RotateRight Stipple Term Up; do \ + install -g root -m 644 -o root $$file \ + debian/tmp/usr/lib/X11/Pixmap/$$file; \ + done + install -g root -m 644 -o root pixmap.man \ + debian/tmp/usr/share/man/man1/pixmap.1 + -gzip -f -9 debian/tmp/usr/share/man/man1/pixmap.1 + install -g root -m 644 -o root debian/menu \ + debian/tmp/usr/share/menu/$(p) + install -g root -m 644 -o root debian/changelog \ + debian/tmp/usr/share/doc/$(p)/changelog.Debian + install -g root -m 644 -o root CHANGES \ + debian/tmp/usr/share/doc/$(p)/changelog + -gzip -f -9 debian/tmp/usr/share/doc/$(p)/* + install -g root -m 644 -o root debian/copyright \ + debian/tmp/usr/share/doc/$(p)/copyright + install -g root -m 644 -o root debian/conffiles debian/tmp/DEBIAN/. + install -g root -m 755 -o root debian/post* debian/tmp/DEBIAN/. + install -g root -m 755 -o root debian/prerm debian/tmp/DEBIAN/. + dpkg-shlibdeps pixmap + dpkg-gencontrol -isp + chown -R root.root debian/tmp + chmod -R g-ws debian/tmp + dpkg --build debian/tmp .. + rm -f clean + +define checkdir + test -f debian/rules +endef + +binary-indep: checkroot build +# nothing to do + +# Below here is fairly generic really + +binary: binary-indep binary-arch + +source diff: + @echo >&2 'source and diff are obsolete - use dpkg-source -b'; false + +checkroot: + $(checkdir) + test root = "`whoami`" + +.PHONY: binary binary-arch binary-indep clean checkroot --- pixmap-2.6pl4.orig/Dialog.c +++ pixmap-2.6pl4/Dialog.c @@ -88,7 +88,7 @@ Widget w; XtPointer client_data, call_data; { - selected = (int)client_data; + selected = (int)(long)client_data; } #ifdef USE_ATHENA @@ -211,7 +211,7 @@ if (options & dialog_buttons[i].flag) XawDialogAddButton(popup->dialog_widget, dialog_buttons[i].name, SetSelected, - (XtPointer)dialog_buttons[i].flag); + (XtPointer)(long)dialog_buttons[i].flag); #endif /* USE_ATHENA */ popup->options = options; --- pixmap-2.6pl4.orig/Pixmap.h +++ pixmap-2.6pl4/Pixmap.h @@ -69,7 +69,7 @@ #include #include #include -#include "xpm.h" +#include /* Resources: --- pixmap-2.6pl4.orig/APixmap.ad +++ pixmap-2.6pl4/APixmap.ad @@ -1,6 +1,6 @@ Pixmap*selFile.allowShellResize: True Pixmap*TransientShell.allowShellResize: True -Pixmap*font: -adobe-helvetica-bold-r-normal--*-120-*-*-*-*-iso*-* +Pixmap*font: -adobe-helvetica-bold-r-normal--*-100-*-*-*-*-iso*-* Pixmap*shapeStyle: oval Pixmap*cursor: left_ptr Pixmap*pane.orientation: horizontal --- pixmap-2.6pl4.orig/MPixmap.ad +++ pixmap-2.6pl4/MPixmap.ad @@ -1,5 +1,5 @@ Pixmap*TransientShell.allowShellResize: True -Pixmap*fontList:-adobe-helvetica-bold-r-normal--12-120-*-*-*-*-iso*-* +Pixmap*fontList:-adobe-helvetica-bold-r-normal--12-100-*-*-*-*-iso*-* Pixmap*menuCursor: left_ptr Pixmap*pixmap.baseTranslations:#override\ --- pixmap-2.6pl4.orig/Pixmap-color +++ pixmap-2.6pl4/Pixmap-color @@ -0,0 +1,18 @@ +! The App-defaults file for Pixmap on a color screen. + +#include "Pixmap" + +*background: medium blue +*foreground: cyan +*borderColor: plum +*frame: deep sky blue +*highlight: magenta +*Command.background: purple +*Toggle.background: purple +*MenuButton.background: purple +*Command.foreground: white +*Toggle.foreground: white +*MenuButton.foreground: white +*status.foreground: green +*Dialog.icon.foreground: pale green +*bitmap.stippled: off --- pixmap-2.6pl4.orig/Imakefile +++ pixmap-2.6pl4/Imakefile @@ -7,8 +7,11 @@ XCOMM Created: April 20, 1991. XCOMM +XCOMM CDEBUGFLAGS=-g + XCOMM def/undef USE_MOTIF there if you want Pixmap to use Motif or not. #undef USE_MOTIF +#ifndef __linux__ #ifdef HPArchitecture CCOPTIONS = -Aa -D_HPUX_SOURCE -DNO_EDITRES #if ProjectX > 4 @@ -19,18 +22,17 @@ R5EXT = -I. #endif #endif +#endif XCOMM Where you have rgb.txt -RGBTXT = $(LIBDIR)/rgb.txt +RGBTXT = $(CONFDIR)/rgb.txt XCOMM LUCS extra variable for where bitmaps go PIXMAPDIR = $(LIBDIR)/Pixmap XCOMM Specify here your Xpm installation directories - XPM_INCLUDEDIR = /usr/local/include - XPM_LIBDIR = $(LIBDIR)/xpm - XPM_INCLUDEDIR = /net/koala/include - XPM_LIBDIR = /net/koala/lib/sun4 + XPM_INCLUDEDIR = /usr/include/X11 + XPM_LIBDIR = /usr/lib EXTRA_INCLUDES = $(R5EXT) -I. -I.. -I$(XPM_INCLUDEDIR) -I/usr/include/$(MOTIFVER) #ifdef USE_MOTIF --- pixmap-2.6pl4.orig/pixmap.man +++ pixmap-2.6pl4/pixmap.man @@ -123,9 +123,8 @@ This button is used to clear one or more pixels. .RE -Every button operation can be changed by means of resources in the -\.Xdefaults file or application defaults file -(/usr/lib/X11/app-defaults/Pixmap). +Every button operation can be changed by means of resources in the .Xdefaults file or application defaults file +(/etc/X11/app-defaults/Pixmap). .SH MENU COMMANDS To make defining shapes easier, \fIpixmap\fP provides several commands for drawing and manipulating the pixmap edited, and commands for file management. --- pixmap-2.6pl4.orig/PixEdit.c +++ pixmap-2.6pl4/PixEdit.c @@ -59,6 +59,7 @@ #include +#include #include #include #include @@ -1865,10 +1866,8 @@ } - -void main(argc, argv) - int argc; - char *argv[]; +int +main(int argc, char *argv[], char *envp[]) { int i, n; Arg wargs[5]; @@ -2211,4 +2210,5 @@ XtRealizeWidget(top_widget); XtAppMainLoop(pixmap_context); + return(0); }