This is an automated email generated because a ref change occurred in the
git repository for project wmaker-crm.git.
The branch, next has been updated
via cdaa7a4520e688e404c8e4d67a6c0ecb39acd0c7 (commit)
via 7df224440b438ca6d749a4d684f61fc011c876ac (commit)
via 01ad3ead5d870e2f1b4b04a605d9f79929363e1e (commit)
via 6fa1c0c009c9d414dc59ec90d7d1dfc97841f38c (commit)
via ac92f1a844f27c857474b472b8a7481a677be840 (commit)
via 21d3fadebb7c1f3886ecd06f21eb954ccd326a91 (commit)
from 39866295900af906707abe715d899d04a0756c90 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit cdaa7a4520e688e404c8e4d67a6c0ecb39acd0c7
Author: Doug Torrance <dtorra...@piedmont.edu>
Date: Fri, 10 Mar 2017 02:39:34 -0500
URL: <http://repo.or.cz/wmaker-crm.git/cdaa7a4520e688e4>
doc: Add info about user icons directory to manpage.
Based on patch in Debian package. See:
debian/patches/51_wmaker_man.diff
---
doc/wmaker.in | 3 +++
1 file changed, 3 insertions(+)
diff --git a/doc/wmaker.in b/doc/wmaker.in
index 06598c02cda2..8fd01a2c4bed 100644
--- a/doc/wmaker.in
+++ b/doc/wmaker.in
@@ -113,6 +113,9 @@ and here, in that order. Unless, the indicated path is an
absolute path.
.B ~/GNUstep/Library/WindowMaker/Pixmaps/
Window Maker looks for \fBpixmaps\fP here
.TP
+.B ~/GNUstep/Library/Icons/
+Window Maker looks for \fBicons\fP here
+.TP
.B ~/GNUstep/Library/WindowMaker/Backgrounds/
Window Maker looks for backgrounds here
.TP
commit 7df224440b438ca6d749a4d684f61fc011c876ac
Author: Doug Torrance <dtorra...@piedmont.edu>
Date: Fri, 10 Mar 2017 02:39:33 -0500
URL: <http://repo.or.cz/wmaker-crm.git/7df224440b438ca6>
doc: Update global autostart/exitscript path in manpage.
---
doc/wmaker.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/doc/wmaker.in b/doc/wmaker.in
index 1ba8e3548b28..06598c02cda2 100644
--- a/doc/wmaker.in
+++ b/doc/wmaker.in
@@ -107,7 +107,7 @@ might be shut down before the script is executed.
.B ~/GNUstep/Library/WindowMaker/
The menu file indicated in WMRootMenu is looked for here...
.TP
-.B /etc/X11/WindowMaker/
+.B @pkgdatadir@/
and here, in that order. Unless, the indicated path is an absolute path.
.TP
.B ~/GNUstep/Library/WindowMaker/Pixmaps/
commit 01ad3ead5d870e2f1b4b04a605d9f79929363e1e
Author: Doug Torrance <dtorra...@piedmont.edu>
Date: Fri, 10 Mar 2017 02:39:32 -0500
URL: <http://repo.or.cz/wmaker-crm.git/01ad3ead5d870e2f>
doc: Use new defsdatadir variable to specify defaults directory in manpage.
---
doc/Makefile.am | 2 +-
doc/wmaker.in | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 30d46f882307..36ff48d17fdd 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -35,8 +35,8 @@ wmaker.1: wmaker.in Makefile $(top_builddir)/config.h
$(AM_V_GEN)$(top_srcdir)/script/replace-ac-keywords.sh \
--header "$(top_builddir)/config.h" --filter "HAVE_INOTIFY" \
--filter "USE_ICCCM_WMREPLACE" \
- -D"sysconfdir=$(sysconfdir)" --replace "sysconfdir" \
-D"pkgdatadir=$(pkgdatadir)" --replace "pkgdatadir" \
+ -D"defsdatadir=$(defsdatadir)" --replace "defsdatadir" \
-o "wmaker.1" "$(srcdir)/wmaker.in"
wmsetbg.1: wmsetbg.in Makefile $(top_builddir)/config.h
diff --git a/doc/wmaker.in b/doc/wmaker.in
index f5c22ef689fe..1ba8e3548b28 100644
--- a/doc/wmaker.in
+++ b/doc/wmaker.in
@@ -85,7 +85,7 @@ Attribute Editor (right drag the application's title bar,
select
Attributes) instead of modifying this file directly. There are just a
few options not available using the Attributes Editor.
.TP
-.B @sysconfdir@/WindowMaker/Defaults/
+.B @defsdatadir@/
All the above-mentioned files are READ from here if not found except
for WMState, which is COPIED from here. No matter where they are read
from, if it's necessary to write configuration changes back into this
commit 6fa1c0c009c9d414dc59ec90d7d1dfc97841f38c
Author: Doug Torrance <dtorra...@piedmont.edu>
Date: Fri, 10 Mar 2017 02:39:31 -0500
URL: <http://repo.or.cz/wmaker-crm.git/6fa1c0c009c9d414>
configure: Add option to specify global defaults directory.
Previously, this was only (partially) possible by redefining the macro
GLOBAL_DEFAULTS_SUBDIR. This told Window Maker to look for the global
config files in a particular subdirectory of SYSCONFDIR.
However:
* This is undocumented.
* GLOBAL_DEFAULTS_SUBDIR is ignored when installing the config files. They
are always installed to SYSCONFDIR/WindowMaker.
To solve these issues, we add a "--with-defsdatadir" option to configure
which allows a user to specify the global defaults directory.
---
Makefile.am | 4 ++--
WINGs/userdefaults.c | 7 ++-----
WindowMaker/Defaults/Makefile.am | 3 ---
configure.ac | 15 +++++++++++++++
src/defaults.c | 11 +++--------
src/main.c | 6 +-----
src/misc.c | 2 +-
7 files changed, 24 insertions(+), 24 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index 638cfed5348a..786d3e89781e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -21,8 +21,8 @@ config-paths.h: Makefile
@echo '/* where shared data is stored */' >> $@
@echo '#define PKGDATADIR "$(datadir)/WindowMaker"' >> $@
@echo '' >> $@
- @echo '/* where the configuration is stored */' >> $@
- @echo '#define SYSCONFDIR "$(sysconfdir)"' >> $@
+ @echo '/* where the global defaults are stored */' >> $@
+ @echo '#define DEFSDATADIR "$(defsdatadir)"' >> $@
ACLOCAL_AMFLAGS = -I m4
diff --git a/WINGs/userdefaults.c b/WINGs/userdefaults.c
index 65ed09912671..3ec776c61772 100644
--- a/WINGs/userdefaults.c
+++ b/WINGs/userdefaults.c
@@ -103,17 +103,14 @@ char *wdefaultspathfordomain(const char *domain)
}
/* XXX: doesn't quite belong to *user*defaults.c */
-#ifndef GLOBAL_DEFAULTS_SUBDIR
-#define GLOBAL_DEFAULTS_SUBDIR "WindowMaker"
-#endif
char *wglobaldefaultspathfordomain(const char *domain)
{
char *t = NULL;
size_t len;
- len = strlen( SYSCONFDIR ) + strlen( GLOBAL_DEFAULTS_SUBDIR ) +
strlen(domain) + 3;
+ len = strlen(DEFSDATADIR) + strlen(domain) + 2;
t = wmalloc(len);
- snprintf(t, len, "%s/%s/%s", SYSCONFDIR, GLOBAL_DEFAULTS_SUBDIR,
domain);
+ snprintf(t, len, "%s/%s", DEFSDATADIR, domain);
return t;
}
diff --git a/WindowMaker/Defaults/Makefile.am b/WindowMaker/Defaults/Makefile.am
index e61b41f377d3..182385c1fe95 100644
--- a/WindowMaker/Defaults/Makefile.am
+++ b/WindowMaker/Defaults/Makefile.am
@@ -1,6 +1,3 @@
-
-defsdatadir = $(sysconfdir)/WindowMaker
-
defsdata_DATA = WMRootMenu WMWindowAttributes WindowMaker WMState WMGLOBAL
wpexecbindir = @wprefs_bindir@
diff --git a/configure.ac b/configure.ac
index 8439c80961c2..2b43e00d21b5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -867,6 +867,21 @@ AS_IF([test "x$with_gnustepdir" = "x"],
AC_SUBST([wprefs_datadir])dnl
AC_SUBST([wprefs_bindir])dnl
+dnl Support for DEFSDATADIR option
+dnl ============================
+AC_ARG_WITH([defsdatadir],
+ [AS_HELP_STRING([--with-defsdatadir=PATH], [specify where global defaults
are located [SYSCONFDIR/WindowMaker]])],
+ [AS_CASE([$withval],
+ [yes|no], [AC_MSG_ERROR([bad value '$withval' for --with-defsdatadir,
expected a path]) ],
+ [/*], [], dnl Absolute path, ok
+ [\$*], [], dnl Assumes it starts with a reference to $prefix or a
similar variable, ok
+ [AC_MSG_ERROR([bad path '$withval' for defsdatadir, expecting an
absolute path])])],
+ [with_defsdatadir=""])
+
+AS_IF([test "x$with_defsdatadir" != "x"],
+ [defsdatadir="$with_defsdatadir"],
+ [defsdatadir='${sysconfdir}/WindowMaker'])
+AC_SUBST([defsdatadir])dnl
dnl Enable User Defined Menu thing
dnl ==============================
diff --git a/src/defaults.c b/src/defaults.c
index f295ce178397..f83f6a5da92f 100644
--- a/src/defaults.c
+++ b/src/defaults.c
@@ -67,11 +67,6 @@
#define MAX_SHORTCUT_LENGTH 32
-#ifndef GLOBAL_DEFAULTS_SUBDIR
-#define GLOBAL_DEFAULTS_SUBDIR "WindowMaker"
-#endif
-
-
typedef struct _WDefaultEntry WDefaultEntry;
typedef int (WDECallbackConvert) (WScreen *scr, WDefaultEntry *entry,
WMPropList *plvalue, void *addr, void **tdata);
typedef int (WDECallbackUpdate) (WScreen *scr, WDefaultEntry *entry, void
*tdata, void *extra_data);
@@ -879,7 +874,7 @@ static WMPropList *readGlobalDomain(const char *domainName,
Bool requireDictiona
char path[PATH_MAX];
struct stat stbuf;
- snprintf(path, sizeof(path), "%s/%s/%s", SYSCONFDIR,
GLOBAL_DEFAULTS_SUBDIR, domainName);
+ snprintf(path, sizeof(path), "%s/%s", DEFSDATADIR, domainName);
if (stat(path, &stbuf) >= 0) {
globalDict = WMReadPropListFromFile(path);
if (globalDict && requireDictionary &&
!WMIsPLDictionary(globalDict)) {
@@ -929,7 +924,7 @@ void wDefaultsMergeGlobalMenus(WDDomain * menuDomain)
return;
#ifdef GLOBAL_PREAMBLE_MENU_FILE
- submenu = WMReadPropListFromFile(SYSCONFDIR "/" GLOBAL_DEFAULTS_SUBDIR
"/" GLOBAL_PREAMBLE_MENU_FILE);
+ submenu = WMReadPropListFromFile(DEFSDATADIR "/"
GLOBAL_PREAMBLE_MENU_FILE);
if (submenu && !WMIsPLArray(submenu)) {
wwarning(_("invalid global menu file %s"),
GLOBAL_PREAMBLE_MENU_FILE);
@@ -943,7 +938,7 @@ void wDefaultsMergeGlobalMenus(WDDomain * menuDomain)
#endif
#ifdef GLOBAL_EPILOGUE_MENU_FILE
- submenu = WMReadPropListFromFile(SYSCONFDIR "/" GLOBAL_DEFAULTS_SUBDIR
"/" GLOBAL_EPILOGUE_MENU_FILE);
+ submenu = WMReadPropListFromFile(DEFSDATADIR "/"
GLOBAL_EPILOGUE_MENU_FILE);
if (submenu && !WMIsPLArray(submenu)) {
wwarning(_("invalid global menu file %s"),
GLOBAL_EPILOGUE_MENU_FILE);
diff --git a/src/main.c b/src/main.c
index d7aee3d7ef41..a00d9c7f4350 100644
--- a/src/main.c
+++ b/src/main.c
@@ -59,10 +59,6 @@
#include <WINGs/WUtil.h>
-#ifndef GLOBAL_DEFAULTS_SUBDIR
-#define GLOBAL_DEFAULTS_SUBDIR "WindowMaker"
-#endif
-
/****** Global Variables ******/
struct wmaker_global_variables w_global;
@@ -662,7 +658,7 @@ static int real_main(int argc, char **argv)
printf("Window Maker %s\n", VERSION);
exit(0);
} else if (strcmp(argv[i], "--global_defaults_path") ==
0) {
- printf("%s/%s\n", SYSCONFDIR, GLOBAL_DEFAULTS_SUBDIR);
+ printf("%s\n", DEFSDATADIR);
exit(0);
} else if (strcmp(argv[i], "-locale") == 0 ||
strcmp(argv[i], "--locale") == 0) {
i++;
diff --git a/src/misc.c b/src/misc.c
index 02aa40172f9b..502f2b561273 100644
--- a/src/misc.c
+++ b/src/misc.c
@@ -1017,7 +1017,7 @@ Bool UpdateDomainFile(WDDomain * domain)
dict = domain->dictionary;
if (WMIsPLDictionary(domain->dictionary)) {
/* retrieve global system dictionary */
- snprintf(path, sizeof(path), "%s/WindowMaker/%s", SYSCONFDIR,
domain->domain_name);
+ snprintf(path, sizeof(path), "%s/%s", DEFSDATADIR,
domain->domain_name);
if (stat(path, &stbuf) >= 0) {
shared_dict = WMReadPropListFromFile(path);
if (shared_dict) {
commit ac92f1a844f27c857474b472b8a7481a677be840
Author: Doug Torrance <dtorra...@piedmont.edu>
Date: Thu, 9 Mar 2017 23:41:56 -0500
URL: <http://repo.or.cz/wmaker-crm.git/ac92f1a844f27c85>
wrlib: Bump soname version to 6.
Usually, a soname bump is reserved for when an interface is added, changed,
or removed. This has not happened to wrlib. However, I think there is a
special circumstance that warrants the bump.
In particular, there are two versions of wrlib version 5 in the wild:
* The one that shipped with wmaker 0.95.6, which uses symbol version
LIBWRASTER3.
* The one that shipped with wmaker 0.95.7, which uses symbol version
LIBWRASTER5.
This was reported in Debian bug #811304 [1]. Binaries which were built
against the older wrlib won't run after upgrading to the newer one, even
though they are supposedly using the same soname version.
(We get around this currently in Debian by patching the old LIBWRASTER3
symbol version back in.)
I propose we bump to version 6 and put this mess behind us.
[1] https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=811304
---
configure.ac | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/configure.ac b/configure.ac
index c77717cb5a10..8439c80961c2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -71,7 +71,7 @@ dnl 6. If any interfaces have been removed or changed since
the last
dnl public release, then set age to 0.
dnl
dnl libwraster
-WRASTER_CURRENT=5
+WRASTER_CURRENT=6
WRASTER_REVISION=0
WRASTER_AGE=0
WRASTER_VERSION=$WRASTER_CURRENT:$WRASTER_REVISION:$WRASTER_AGE
commit 21d3fadebb7c1f3886ecd06f21eb954ccd326a91
Author: Doug Torrance <dtorra...@piedmont.edu>
Date: Thu, 9 Mar 2017 23:41:55 -0500
URL: <http://repo.or.cz/wmaker-crm.git/21d3fadebb7c1f38>
ChangeLog: Update with commits since v0.95.7.
---
ChangeLog | 92 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 92 insertions(+)
diff --git a/ChangeLog b/ChangeLog
index 7096b2c5506d..59ecf5a11d3c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,95 @@
+Changes since version 0.95.7:
+.............................
+
+- Build on Ubuntu 14.04
+ (Johann Haarhoff <joh...@haarhoff.org.za>)
+- Window Maker 0.95.7 Debian files
+- create_appicon_from_dock checks if no_appicon flag is set
+- New applications do not create Cached Icon
+- Remove unused argument in save_appicon
+- Avoid recreate Cached icon moving between docks
+- Avoid create again a docked application cache icon
+- save the icon filename instead the full path
+- Remove cache icon when detached
+- usermenu.c Avoid compiler warnings
+- Enable usermenu
+ (Rodolfo García Peñas (kix) <k...@kix.es>)
+- wmaker: fixed infinite loop in switching within group
+ (Satya Mishra <quf...@gmail.com>)
+- wmaker: Print error dialog when attempting to delete an in-use workspace.
+ (Doug Torrance <dtorra...@piedmont.edu>)
+- debian: Ignore missing documentation for --runstatedir.
+- debian: Use dh_autoreconf.
+- debian: Simplify debian/rules.
+- debian: Fix typo occured. (Thanks, lintian.)
+- debian: wmaker manpage moved from 1x to 1.
+ (Andreas Metzler <ametz...@bebt.de>)
+- debian: Add wmiv to wmaker package.
+- debian: Add version 0.95.6-1.2 entry to changelog.
+- debian: Update with final version of 0.95.7-1 packaging.
+- wmaker: Maintain sorting of windows by workspace in switch menu.
+- debian: Update with version 0.95.7-2 packaging.
+- wmaker: Update copyright years in info panel.
+- wmaker: Remove prototype for unused get_right_position_on_screen function.
+- wmaker: Fix typos (used codespell).
+- wmaker: Add option for window snap to top edge to maximize to full screen.
+- wmaker: Use window placement settings on other workspaces.
+- wmaker: Add keyboard shortcuts for keeping window on top or at bottom.
+- wmaker: Display keyboard shortcuts for remaining options in window menu.
+- wmaker: Fix whitespace in menu.h; passes checkpatch.pl inspection.
+- wmaker: Implement basic menu shading.
+ (Doug Torrance <dtorra...@piedmont.edu>)
+- Translations: Dutch language files updated
+- Translations: Frisian language files updated
+ (Alwin <translati...@ziggo.nl>)
+- wmlib: Add pkg-config file.
+- wmlib: Remove install-exec-local target.
+- WPrefs: Code formatting in TexturePanel.c; minimizes checkpatch.pl warnings.
+- WPrefs: Add support for fpixmap ("fillscale") texture.
+- check-doc: Ignore runstatedir in check-cmdline-options-doc.sh
+- check-doc: Ignore with-aix-soname in check-cmdline-options-doc.sh
+- debian: Remove 56_ignore_runstatedir.diff.
+- debian: Update with version 0.95.7-3 packaging.
+- debian: Update with version 0.95.7-4 packaging.
+- debian: Update with version 0.95.7-5 packaging.
+- debian: Update with version 0.95.7-6 packaging.
+- wmmenugen: Fix segfault; argv[argc] doesn't exist.
+ (Doug Torrance <dtorra...@piedmont.edu>)
+- getstyle: fix wcopy_file paths
+ (Alexandru Lazar <ala...@startmail.com>)
+- wmaker: fix stacking order of dock and fullscreen
+- wmaker: allow alt+tabbed windows over fullscreen
+ (Bjørn Mork <bj...@mork.no>)
+- WPrefs: Update path for Debian menu
+- Use wprefs_bindir output variable to set WPrefs path in menus.
+- Remove WindowMaker/mkMakefile script.
+- Don't try and add removed file mkMakefile to distribution tarball.
+- Look for plmenu in build directory when creating WMRootMenu.
+- debian: Update with version 0.95.7-7 packaging.
+- configure: Use PKG_PROG_PKG_CONFIG macro to allow cross building.
+ (Doug Torrance <dtorra...@piedmont.edu>)
+- Trivial cleanup: Removed unused defines.
+ (Roman Dobosz <gry...@gmail.com>)
+- Added 'head' parameter to wMaximizeWindow
+- Added wGetHeadRelativeToCurrentHead function
+- Added option for ability to move half-maximized between heads.
+- Added possibility for half-maximized windows to move across the screens.
+- Fixed wrong (re)stored dimensions for unmaximized window.
+ (gryf <gry...@gmail.com>)
+- Bugfix for moving windows between heads.
+- New option for enabling alternative half-maximized window movement.
+- Alternative way for traversing half-maximized windows.
+- New option for moving mouse pointer along with half-maximized windows.
+- Implementation for moving mouse pointer within the maximized window.
+- Refactoring handleMaximize() function
+- Removed trailing whitespaces from readme files.
+- Fixed couple of compilator warning and removed unused macros.
+ (Roman Dobosz <gry...@gmail.com>)
+- wmaker: Do not place icons under the dock
+ (Cyrus Rahman <crah...@gmail.com>)
+- debian: Update with version 0.95.7-8 packaging.
+ (Doug Torrance <dtorra...@piedmont.edu>)
+
Changes since version 0.95.6:
.............................
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 92 ++++++++++++++++++++++++++++++++
Makefile.am | 4 +-
WINGs/userdefaults.c | 7 +--
WindowMaker/Defaults/Makefile.am | 3 --
configure.ac | 17 +++++-
doc/Makefile.am | 2 +-
doc/wmaker.in | 7 ++-
src/defaults.c | 11 ++--
src/main.c | 6 +--
src/misc.c | 2 +-
10 files changed, 123 insertions(+), 28 deletions(-)
repo.or.cz automatic notification. Contact project admin crma...@gmail.com
if you want to unsubscribe, or site admin ad...@repo.or.cz if you receive
no reply.
--
wmaker-crm.git ("The Window Maker window manager")
--
To unsubscribe, send mail to wmaker-dev-unsubscr...@lists.windowmaker.org.
