1
0
mirror of https://github.com/gryf/wmaker.git synced 2025-12-20 04:48:06 +01:00
Commit Graph

2925 Commits

Author SHA1 Message Date
Andreas Metzler
ce04eabec6 Build Debian packages with RandR support
Add libxrandr-dev to build-depends.
2010-08-29 14:55:14 +02:00
Carlos R. Mafra
368e7e3e8f WINGs: Remove private snprintf() implementation
The code was added in 2001 in commit acdc0e3d6b for
"backwards compat". This motivation no longer exists in 2010,
so there is no reason to keep a private implementation of
a standard function from the C library.
2010-08-29 14:55:14 +02:00
Carlos R. Mafra
5c8eb580b3 configure: Remove --disable-verbose-compile hack
Instead of using the --disable-verbose-compile hack, let's
use the standard option --enable-silent-rules (or 'make V=0' directly)
available with autoconf 1.11 and higher.

This is enabled in autoconf by using 'silent-rules' in AM_INIT_AUTOMAKE.
The verbosity of compilation is reduced in a similar manner as using
the --disable-verbose-compile option, so we can remove all that ugly
hackery.
2010-08-29 14:55:14 +02:00
Carlos R. Mafra
48044feb29 configure: Remove gcc warning about signed x unsigned 2010-08-29 14:55:14 +02:00
Carlos R. Mafra
2031a25869 configure: Replace obsolete macros 2010-08-29 14:55:14 +02:00
Carlos R. Mafra
be05b0f01e configure: Use AS_HELP_STRING macro to print messages
According to the autoconf manual, using AS_HELP_STRING is recommended
to avoid having to manually adjust the alignment of help text
in ./configure --help
2010-08-29 14:55:14 +02:00
Carlos R. Mafra
b17077ede0 Avoid more gcc warnings
WUtil.h:212: warning: function declaration isn’t a prototype
WUtil.h:259: warning: function declaration isn’t a prototype
WUtil.h:300: warning: function declaration isn’t a prototype
WINGsP.h:593: warning: function declaration isn’t a prototype
WINGsP.h:599: warning: function declaration isn’t a prototype
WINGs.h:616: warning: function declaration isn’t a prototype

raster.c:295: warning: no previous prototype for ‘calculateCombineArea’
2010-08-29 14:55:14 +02:00
Carlos R. Mafra
be065e3bf4 Add /usr/local/share/WindowMaker dir to wmgenmenu 2010-08-29 14:55:14 +02:00
Andreas Metzler
894bf4e292 Fix build failure on missing randr
When building without xrandr support do not try to modify undefined
variable has_randr.
2010-08-29 14:55:13 +02:00
Carlos R. Mafra
c201e1612c Make wmaker XRandR aware
This patch makes wmaker automatically Restart() to take into account
resolution changes done by xrandr.

The motivation to write this patch is that when I start my laptop connected
to an external monitor (VGA1), the resolution in the monitor is initially
wrong (perhaps this is a bug in XOrg or OpenSuse, but anyway), so I always
do this after starting wmaker:

xrandr --output VGA1 --preferred

The resolution in the external monitor gets fixed, but wmaker does not
recognize the change automatically and I have to manually restart it.

So this patch avoids the last step by making wmaker be XRandR-aware.
Wmaker now restarts automatically when it receives a RRChangeScreenNotify
event and I don't have to do the last part of the silly procedure described
above.

I am not sure if restarting wmaker is the most elegant solution, but
it at least solves part of my issue with wmaker + xrandr.
2010-08-22 22:13:45 +02:00
Andreas Metzler
f6b7178542 Correct .TH header
The space in "Window Maker" needs to be escaped in the .TH header,
otherwise parsing fails. (The section would be set to MAKER instead of
1x.)
2010-08-21 12:21:56 +02:00
NIR Ginko
ce32e2b5e0 Add Russian manpages
[includes build fixes by Andreas Metzler]
2010-08-21 12:21:56 +02:00
Martin Dietze
6269d3a66f Made Debian autobuild work again 2010-08-19 16:59:56 +02:00
Andreas Metzler
3289b6c772 SelectWindowsMouseButton -> MouseLeftButtonAction
Implement the switch from SelectWindowsMouseButton et al. to
MouseLeftButtonAction = SelectWindows from WindowMaker 0.65 in Debian's
customized defaults. Closes: #116963
2010-08-18 15:26:17 +02:00
Andreas Metzler
0baac21e95 Add some bug closers
List debian bugs fixed in wmaker-crm in debian/changelog.
2010-08-18 15:26:17 +02:00
Andreas Metzler
5423e8318e Use automake instead of automake1.4.
Use latest automake (instead of automake1.4) for building.
Closes: #549157
2010-08-18 15:24:58 +02:00
Andreas Metzler
c68597b6e8 update debian/changelog. 2010-08-17 10:27:59 +02:00
Andreas Metzler
a78cff4e7f Typo fixes 2010-08-17 10:27:59 +02:00
Andreas Metzler
3b289c4a8c Escape minus sign ("-") in manpages.
man will render - as a hyphen (U+2010) instead of as a minus sign
(U+002D). Fix this by escaping the dash, using \-.
2010-08-17 10:27:59 +02:00
Andreas Metzler
eae99ee833 invoke dh_installdeb after dh_makeshlibs
lintian says

W: wmaker source: debian-rules-calls-debhelper-in-odd-order
dh_makeshlibs

and indeed invoking dh_installdeb (which install the maintainerscripts)
before dh_makeshlibs can add the ldconfig call to them causes these
errors:
E: libwutil1: postinst-must-call-ldconfig usr/lib/libWUtil.so.1.0.2
E: libwings2: postinst-must-call-ldconfig usr/lib/libWINGs.so.2.0.1
2010-08-17 10:27:58 +02:00
Andreas Metzler
baef1646ac Ship libWUtils and libWINGs in dedicated packages
Shared libraries need to be shipped in separate packages with shlibs
information. Add libwutil1 and libwings2 packages and let libwings-dev
depend on them.
2010-08-17 10:27:58 +02:00
Andreas Metzler
df8649cf54 Drop dead code from debian rules 2010-08-17 10:26:53 +02:00
Andreas Metzler
492206fe6c Remove unneeded directory creation
There is no need to generate $mandir manually, dh_installman will do
this if necessary.
2010-08-17 10:26:53 +02:00
Andreas Metzler
8dc7c5f554 Generate symlink with dh_link instead of ln -s 2010-08-17 10:26:53 +02:00
Andreas Metzler
15f74cfb10 Invoke dh_link only once.
Instead of calling dh_link multiple times (once for each symlink) just
call it once, listing the requested links in debian/package.links.
2010-08-17 10:26:53 +02:00
Andreas Metzler
3751b587eb Invoke dh_installman only once.
Instead of calling dh_installman multiple times just call it once. List
the manpages that should be installed in package specific
debian/package.manpages.
2010-08-17 10:26:53 +02:00
Andreas Metzler
a1867f2473 Use dh_lintian.
Simplify debian/rules by making use of dh_lintian.
2010-08-17 10:26:53 +02:00
Andreas Metzler
014ced4794 Drop code for generating debian/conffiles
Starting with debhelper v3 mode every file in etc is flagged as a
conffile by dh_installdeb. - Drop (commented) code for doing this
manually from debian/rules.
2010-08-17 10:26:53 +02:00
Andreas Metzler
d7fd103528 stop removing debian/files manually
There is no need to delete debian/files, dh_clean automatically takes
care of this.
2010-08-17 10:26:53 +02:00
Andreas Metzler
493a263a7d Use static debian/libwraster*.files.
debian/*files (or debian/*.install) is usually not generate
dynamically. Implement this for debian/libwraster3-dev.files and
debian/libwraster3.files.
2010-08-17 10:26:53 +02:00
Andreas Metzler
7f59c4dfa3 Use static debian/libwings-dev.files.
debian/*files (or debian/*.install) is usually not generated
dynamically. Implement this for libwings-dev.files.
2010-08-17 10:26:53 +02:00
Andreas Metzler
ac8da4a8f0 remove dead outdated code from debian/rules
-isp is default behaviour of dpkg-gencontrol since 1.13.16 (18 Feb
2006)

The code for generating debian/shlibs.local is not used, remove it.

dpkg-shlibdeps already searches in debian/libwraster3/usr/lib/ by
default.
2010-08-17 10:26:53 +02:00
Andreas Metzler
1150f741ec do not run complete debian build under fakeroot
Use dpkg-buildpackage -rfakeroot option to only run the parts of the
package generation process which require (fake)root privileges under
fakeroot. (e.g. debian/rules build should not be run as root.)
2010-08-17 10:26:53 +02:00
Andreas Metzler
fef3ee5742 patch management with dpkg-source v3
Simplify debian/rules by using dpkg-source v3 (quilt) instead of the
home-grown patch system in debian/rules.

Change debian/nightly_build.sh to build a non-native package.
2010-08-17 10:26:53 +02:00
Andreas Metzler
dcbfb467de remove cruft from debian/rules 2010-08-17 10:26:53 +02:00
Andreas Metzler
c8c613074e Remove ./libtool on clean
... otherwise it is not possible to build twice from the
same unpacked sourcetree.
2010-08-07 14:53:12 +02:00
Andreas Metzler
c20bfe9737 Use ${binary:Version} instead of ${Source-Version}
Use ${binary:Version} instead of deprecated ${Source-Version}
(Lintian: substvar-source-version-is-deprecated).
2010-08-07 14:53:11 +02:00
Andreas Metzler
7b74111259 Use dh_prep instead of "dh_clean -k"
Use dh_prep instead of "dh_clean -k" (dh-clean-k-is-deprecated). However
do not replace instances of dh_clean without -k option. (Debian
bug590244). Build-Depend on debhelper 7.
2010-08-07 14:53:11 +02:00
Andreas Metzler
de48a9b1f5 Invoke ./configure with correct --build argument.
Invoke ./configure with correct --build argument, as per
/usr/share/doc/autotools-dev/README.Debian.gz.
2010-08-07 14:52:49 +02:00
Andreas Metzler
dadb78b835 Move homepage from description text to homepage field. 2010-08-07 14:50:58 +02:00
Andreas Metzler
ef2349bc69 Add ${misc:Depends} to all package dependencies. 2010-08-07 14:50:58 +02:00
Andreas Metzler
930a3922d5 Add libxmu-dev to build-depends. 2010-08-07 14:50:58 +02:00
Andreas Metzler
6300d3462b line wrap build-depends for enhanced readability.
line-wrapping has been allowed in debian/control since 3.7.0.0, released
April 2006.
2010-08-07 14:50:58 +02:00
Andreas Metzler
9215d2d9dd Fix duplicate entry in manpage.
/usr/share/WindowMaker/Pixmaps/ is listed twice, delete second line.
[Pulled from WindowMaker Debian packaging.]
2010-08-01 18:13:09 +02:00
Andreas Metzler
879d84d883 floppy mountpoint is /media/floppy
Correct floppy mountpoint location to match FHS.

Quoting FHS <http://www.pathname.com/fhs/pub/fhs-2.3.html>:
/media : Mount point for removeable media
Purpose

This directory contains subdirectories which are used as mount points for removeable media such as floppy disks, cdroms and zip disks.
[...]
The following directories, or symbolic links to directories, must be in /media, if the corresponding subsystem is installed:

Directory	Description
floppy	Floppy drive (optional)
[...]
2010-08-01 18:13:09 +02:00
Andreas Metzler
c238d8417f link libWINGs against libm if necessary
libWINGs is using mathematical functions (atan, sqrt, etc.). Check
whether we need to lik against libm to use these and link libWINGs
against it if necessary.
2010-08-01 18:13:09 +02:00
Andreas Metzler
3f27b998a7 link libWINGs against libfontconfig
libWINGs is using libfontconfig function (not just via libXft, e.g.
FcPatternDel). Search for library in ./configure and link libWINGs
against it.
2010-08-01 18:13:09 +02:00
Andreas Metzler
abb8c62fe0 link libWINGs against libXft
libWINGs is using libXft functions (e.g. XftFontClose). Link libWINGs
against libXft.

ametzler@argenau:/tmp/WMAKER/wmaker-crm$ LD_LIBRARY_PATH=debian/wmaker/usr/lib ldd -r debian/wmaker/usr/lib/libWINGs.so.2.0.1 2>&1 | grep XftFontClose
undefined symbol: XftFontClose (debian/wmaker/usr/lib/libWINGs.so.2.0.1)
2010-08-01 18:13:09 +02:00
Andreas Metzler
c396e8ca4f link libWINGs against libwraster
libWINGs is using libwraster functions (e.g. RScaleImage) and therefore
needs to be linked against it.

ametzler@argenau:/tmp/WMAKER/wmaker-crm$ env LD_LIBRARY_PATH=debian/wmaker/usr/lib ldd -r debian/wmaker/usr/lib/libWINGs.so.2.0.1 2>&1 | grep RScaleIma
undefined symbol: RScaleImage   (debian/wmaker/usr/lib/libWINGs.so.2.0.1)
2010-08-01 18:13:09 +02:00
Andreas Metzler
ffb803a0ba link libWINGs against libWUtil
libWINGs is using libWUtil functions (e.g. WMAddIdleHandler). Reorder
lib_LTLIBRARIES to build libWUtil before libWINGs. Link libWINGs against
libWUtil.
2010-08-01 18:13:09 +02:00