or USE_X11BASE set, but don't include mk/x11.buildlink3.mk directly or
via buildlink3.mks
- introduce BUILDLINK_PREFIX.libXpm as alias for BUILDLINK_PREFIX.xpm
in the !modular case
- fix some cases where the check for libX11 couldn't work at all by using
C++ for compilation without including the proper headers
Verified using a full X11_TYPE=xorg bulk build without additional
breakage. Discussed with salo@, wiz@ and send to packages@ for feedback.
packages with the modular Xorg equivalent. Those are falling back
to the old location by default, so this commmit doesn't change
dependencies.
graphics/xpm ==> x11/libXpm
fonts/Xft2 ==> x11/libXft
x11/Xfixes ==> x11/libXfixes
x11/xcursor ==> x11/libXcursor
x11/Xrender ==> x11/libXrender
x11/Xrandr ==> libXrandr
3.3:
* Add a showDelay option for the dock.
* Fixed onscreen-keeping code which broke a bit in -rc2.
* Fix incorrect handling of window properties on 64 bit arches.
* Fix pixelsize being the same as size for pango, now it is correct.
* Fix drawing of icons taller than wide, eg gimp.
* Add a 'mirrorhorizontal' gradient, like horizontal but mirrored in the
center and 'splitvertical' which is like vertical but nonlinear in a fancy
way.
* Translations for de, hr and zh_TW added.
* Add initial per-app settings support.
* Fix some outstanding issues with 64-bit support.
* Add an optional delay for displaying submenus so you can move the mouse
over some entries without flashing each submenu.
* Plug some minor memleaks and fix minor bugs.
* Changed algorithm for downscaling window icons.
* New themes!
* Disable support for libstartup-notification by default, it doesn't seem
to work well.
* Allow disabling of duplicate window numbering by option titleNumber in
theme section.
* Add moverelative and resizerelative actions.
* Option middle for menus that make submenus be centered instead of aligned
by the top edge to the parent entry.
* Fix transient (ie dialog) windows being placed offscreen if the parent
is close to the edge of the screen.
3.3-rc2:
* Fixed some typos and errors in rc.xsd
* Add the noStrut option to the dock (to allow maximizing windows over it),
useful when it is not in the above layer.
* Fix transparent terminals not updating when using ToggleDecor.
* Yet more poking at the onscreen-keeping code, should now do the right
thing always.
* Add an option to hide disabled buttons instead of showing them as disabled.
* Hopefully fixed all the remaining pango issues. The new 1.10 release also
fixes shadows again.
* I think the lib linking in Makefile.am is right now, please tell me if it
isn't.
* Added a finnish translation and some minor updates to others.
* Fixed configure.ac so --enable-pango doesn't disable pango support or the
other way around, make enabled be default to get some extra testing.
3.3-rc1:
* Poked around a bit in the code that keeps windows onscreen, if you
are using xinerama, please let me know if things are better/worse/same.
* Add support for pango, disabled by default due to a bug in pango 1.8 that
breaks shadows, it works fine with 1.6.x though. Poke the pango developers
here http://bugzilla.gnome.org/show_bug.cgi?id=169622 if you want this
to be fixed.
* Made edge resist and Send/MoveToEdge not hit windows at layers below
the current one, add option to disable this behaviour.
* Fixed directional focus not getting trapped in omnipresent windows
* Fixed focus actions when bound to the mouse, normal focus cycle is always
linear and directional focus is totally disabled, it makes no sense
anyway, just move the mouse.
* Added an option for the raise/lower/raiselower/unshaderaise/shadelower
options called group that lets you bind stuff to raise/lower the whole
window group. <action name="raise"><group>yes</group></action>
* Add various new actions. I haven't updated the web docs yet, but I think
I managed to get all of them listed in rc.xsd.
* Bugs 1783, 1812, 1863, 1905, 2005, 1957 fixed.
* Some translations added. (ca, no, pl, ru, fr)
and add a new helper target and script, "show-buildlink3", that outputs
a listing of the buildlink3.mk files included as well as the depth at
which they are included.
For example, "make show-buildlink3" in fonts/Xft2 displays:
zlib
fontconfig
iconv
zlib
freetype2
expat
freetype2
Xrender
renderproto
PKGLOCALEDIR and which install their locale files directly under
${PREFIX}/${PKGLOCALEDIR} and sort the PLIST file entries. From now
on, pkgsrc/mk/plist/plist-locale.awk will automatically handle
transforming the PLIST to refer to the correct locale directory.
RECOMMENDED is removed. It becomes ABI_DEPENDS.
BUILDLINK_RECOMMENDED.foo becomes BUILDLINK_ABI_DEPENDS.foo.
BUILDLINK_DEPENDS.foo becomes BUILDLINK_API_DEPENDS.foo.
BUILDLINK_DEPENDS does not change.
IGNORE_RECOMMENDED (which defaulted to "no") becomes USE_ABI_DEPENDS
which defaults to "yes".
Added to obsolete.mk checking for IGNORE_RECOMMENDED.
I did not manually go through and fix any aesthetic tab/spacing issues.
I have tested the above patch on DragonFly building and packaging
subversion and pkglint and their many dependencies.
I have also tested USE_ABI_DEPENDS=no on my NetBSD workstation (where I
have used IGNORE_RECOMMENDED for a long time). I have been an active user
of IGNORE_RECOMMENDED since it was available.
As suggested, I removed the documentation sentences suggesting bumping for
"security" issues.
As discussed on tech-pkg.
I will commit to revbump, pkglint, pkg_install, createbuildlink separately.
Note that if you use wip, it will fail! I will commit to pkgsrc-wip
later (within day).
file's sole purpose was to provide a dependency on pkg-config and set
some environment variables. Instead, turn pkg-config into a "tool"
in the tools framework, where the pkg-config wrapper automatically
adds PKG_CONFIG_LIBDIR to the environment before invoking the real
pkg-config.
For all package Makefiles that included pkg-config/buildlink3.mk, remove
that inclusion and replace it with USE_TOOLS+=pkg-config.
Several changes are involved since they are all interrelated. These
changes affect about 1000 files.
The first major change is rewriting bsd.builtin.mk as well as all of
the builtin.mk files to follow the new example in bsd.builtin.mk.
The loop to include all of the builtin.mk files needed by the package
is moved from bsd.builtin.mk and into bsd.buildlink3.mk. bsd.builtin.mk
is now included by each of the individual builtin.mk files and provides
some common logic for all of the builtin.mk files. Currently, this
includes the computation for whether the native or pkgsrc version of
the package is preferred. This causes USE_BUILTIN.* to be correctly
set when one builtin.mk file includes another.
The second major change is teach the builtin.mk files to consider
files under ${LOCALBASE} to be from pkgsrc-controlled packages. Most
of the builtin.mk files test for the presence of built-in software by
checking for the existence of certain files, e.g. <pthread.h>, and we
now assume that if that file is under ${LOCALBASE}, then it must be
from pkgsrc. This modification is a nod toward LOCALBASE=/usr. The
exceptions to this new check are the X11 distribution packages, which
are handled specially as noted below.
The third major change is providing builtin.mk and version.mk files
for each of the X11 distribution packages in pkgsrc. The builtin.mk
file can detect whether the native X11 distribution is the same as
the one provided by pkgsrc, and the version.mk file computes the
version of the X11 distribution package, whether it's built-in or not.
The fourth major change is that the buildlink3.mk files for X11 packages
that install parts which are part of X11 distribution packages, e.g.
Xpm, Xcursor, etc., now use imake to query the X11 distribution for
whether the software is already provided by the X11 distribution.
This is more accurate than grepping for a symbol name in the imake
config files. Using imake required sprinkling various builtin-imake.mk
helper files into pkgsrc directories. These files are used as input
to imake since imake can't use stdin for that purpose.
The fifth major change is in how packages note that they use X11.
Instead of setting USE_X11, package Makefiles should now include
x11.buildlink3.mk instead. This causes the X11 package buildlink3
and builtin logic to be executed at the correct place for buildlink3.mk
and builtin.mk files that previously set USE_X11, and fixes packages
that relied on buildlink3.mk files to implicitly note that X11 is
needed. Package buildlink3.mk should also include x11.buildlink3.mk
when linking against the package libraries requires also linking
against the X11 libraries. Where it was obvious, redundant inclusions
of x11.buildlink3.mk have been removed.
in the process. (More information on tech-pkg.)
Bump PKGREVISION and BUILDLINK_DEPENDS of all packages using libtool and
installing .la files.
Bump PKGREVISION (only) of all packages depending directly on the above
via a buildlink3 include.
All library names listed by *.la files no longer need to be listed
in the PLIST, e.g., instead of:
lib/libfoo.a
lib/libfoo.la
lib/libfoo.so
lib/libfoo.so.0
lib/libfoo.so.0.1
one simply needs:
lib/libfoo.la
and bsd.pkg.mk will automatically ensure that the additional library
names are listed in the installed package +CONTENTS file.
Also make LIBTOOLIZE_PLIST default to "yes".
* Added spanish and swedish translations
* Changed "Unnamed Desktop" to "Desktop n" where n is the actual number of
the desktop
* Hopefully no more of the hanging X totally bug
* The fullscreen property now overrides aspect hints
* Added M as an alias for Mod3 in the same manner that W is an alias for
Mod4
* Added probably too many options and actions
* ToggleDockAutohide to toggle the autohide option at runtime, doesn't
save it to the config
* keepBorder option to set if you want the 1-pixel border when you
toggleDecorations
* added popupShow and popupPosition to control where and when the
move/resize-popup is shown, these go in the resize section of the config
popup. Position can be Top or Center, popupShow can be Always, Never or
Nonpixel (this is the default).
* Added the xorStyle option to change the behaviour of menus along the
bottom edge, note that the default is true
* warpPointer option in the menu section to control if the mouse cursor is
to be warped by openbox when the menu moves to keep on screen to keep
the cursor in the same place relative to the menu.
* Added back the focusLast option (this controls what happens when you
change desktops and have followMouse on)
* Added an option to set which desktop to start on when you start openbox,
firstdesk. For example, you might like to set it to 5 if you have a 3x3
grid to start in the middle.
Note that this won't build until a buildlink3 bug is fixed. This is not a
regression, as it was already in a non-building state. Please do not file
any PRs regarding this issue.
by moving the inclusion of buildlink3.mk files outside of the protected
region. This bug would be seen by users that have set PREFER_PKGSRC
or PREFER_NATIVE to non-default values.
BUILDLINK_PACKAGES should be ordered so that for any package in the
list, that package doesn't depend on any packages to the left of it
in the list. This ordering property is used to check for builtin
packages in the correct order. The problem was that including a
buildlink3.mk file for <pkg> correctly ensured that <pkg> was removed
from BUILDLINK_PACKAGES and appended to the end. However, since the
inclusion of any other buildlink3.mk files within that buildlink3.mk
was in a region that was protected against multiple inclusion, those
dependencies weren't also moved to the end of BUILDLINK_PACKAGES.
/usr/pkg/etc so I've changed this to sysconfdir; I'm not adding an extra
search path.
Also install default configuration files in place, so that this works out
of the box. If they are not there, the window manager is unconfigured, and
things like window menus do not appear at all.
Bump PKGREVISION to 2.
Changes since 3.0:
* Added japanese translation.
* config_focus_raise declared as guint.
* Strange behavior with focus:followMouse and RaiseLower action fixed.
* use g_snprintf in openbox/session.c instead of sprintf.
* gimp crashes openbox.
* import -frame leaves windows in a temporary "on top" state.
* Programs started with X become zombies upon shutdown.
* desktopnext/previous and desktopleft/right dont quite get along.
that works without blackbox and uses it's own NLS files.
While we're at it, nitpick the following:
fluxbox: as pointed out in PR pkg/19687, fluxbox will detect Xft2 (if available)
and depend on it automatically. Options were: add
CONFIGURE_ARGS+= --disable-xft
or include Xft2's buildlink. For the time being, add the buildlink
following openboxes example.
openbox: USE_BUILDLINK2=YES -- otherwise including buildlink2's is a no-op
