darlinghq/darling-dbuskit
1
0
Fork 0
mirror of https://github.com/darlinghq/darling-dbuskit.git synced 2024-11-23 04:09:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add DBusMenu to the default build if -gui is installed

Browse Source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/dbuskit/trunk@40513 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Niels Grewe 2017-05-23 18:19:26 +00:00
parent 6ce276bad2
commit 5c6d964c0f
5 changed files with 14 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Bundles/DBusMenu/DKMenuRegistry.m
View File

@ -111,9 +111,9 @@
{
[menuProxy menuUpdated: menu];
}
int32_t number = (int32_t)[window windowNumber];
int internalNumber = [window windowNumber];
GSDisplayServer *srv = GSServerForWindow(window);
number = (int32_t)[srv windowDevice: number];
uint32_t number = (uint32_t)(uintptr_t)[srv windowDevice: internalNumber];
NSNumber *boxed = [NSNumber numberWithInt: number];
if ((nil != menu) && (NO == [windowNumbers containsIndex: number]))
{

3
Bundles/DBusMenu/GNUmakefile
View File

@ -6,9 +6,12 @@ DBusMenu_OBJC_FILES = DKMenuProxy.m \
DBusMenu_HEADER_FILES = DKMenuProxy.h \
DKMenuRegistry.h \
DKDBusMenu.h
ADDITIONAL_LIB_DIRS += -L../../Source/DBusKit.framework/Versions/Current/$(GNUSTEP_TARGET_LDIR)
DBusMenu_LDFLAGS += -lDBusKit
DBusMenu_NEEDS_GUI = YES
DBusMenu_PRINCIPAL_CLASS = DKMenuRegistry
DBusMenu_RESOURCE_FILES = \
com.canonical.dbusmenu.xml
include $(GNUSTEP_MAKEFILES)/bundle.make
-include GNUmakefile.postamble

2
GNUmakefile
View File

@ -39,7 +39,7 @@ SUBPROJECTS = Source \
Tools
ifeq ($(strip $(BUILD_GLOBAL_MENU_BUNDLE)),1)
# SUBPROJECTS += Bundles/DBusMenu
SUBPROJECTS += Bundles/DBusMenu
endif
ifeq ($(strip $(BUILD_NOTIFICATION_BUNDLE)),1)

23
configure vendored
View File

@ -11610,22 +11610,8 @@ if test "${enable_global_menu_bundle+set}" = set; then :
fi
if test "$enable_global_menu_bundle" != "no"; then
for ac_header in "AppKit/NSMenu.h"
do :
as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
ac_fn_objc_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
fi
done
HAVE_GUI=0;
if test "$ac_cv_header_AppKit_NSMenu_h" = "yes"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for NSApplicationMain in -lgnustep-gui" >&5
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for NSApplicationMain in -lgnustep-gui" >&5
$as_echo_n "checking for NSApplicationMain in -lgnustep-gui... " >&6; }
if ${ac_cv_lib_gnustep_gui_NSApplicationMain+:} false; then :
$as_echo_n "(cached) " >&6
@ -11670,10 +11656,9 @@ _ACEOF
fi
if test "$ac_cv_lib_gnustep_gui_NSApplicationMain" = "yes"; then
HAVE_GUI=1;
BUILD_GLOBAL_MENU_BUNDLE=1;
fi
if test "$ac_cv_lib_gnustep_gui_NSApplicationMain" = "yes"; then
HAVE_GUI=1;
BUILD_GLOBAL_MENU_BUNDLE=1;
fi
if test "$HAVE_GUI" = "0"; then
if test "$enable_global_menu_bundle" = "yes"; then

11
configure.ac
View File

@ -138,14 +138,11 @@ AC_SUBST(HAVE_LIBCLANG)
AC_ARG_ENABLE(global-menu-bundle,
[ --disable-global-menu-bundle Disable building the global menu bundle.],,)
if test "$enable_global_menu_bundle" != "no"; then
AC_CHECK_HEADERS("AppKit/NSMenu.h")
HAVE_GUI=0;
if test "$ac_cv_header_AppKit_NSMenu_h" = "yes"; then
AC_CHECK_LIB(gnustep-gui, NSApplicationMain)
if test "$ac_cv_lib_gnustep_gui_NSApplicationMain" = "yes"; then
HAVE_GUI=1;
BUILD_GLOBAL_MENU_BUNDLE=1;
fi
AC_CHECK_LIB(gnustep-gui, NSApplicationMain)
if test "$ac_cv_lib_gnustep_gui_NSApplicationMain" = "yes"; then
HAVE_GUI=1;
BUILD_GLOBAL_MENU_BUNDLE=1;
fi
if test "$HAVE_GUI" = "0"; then
if test "$enable_global_menu_bundle" = "yes"; then