Author: thebeing Date: Tue May 23 20:19:26 2017 New Revision: 40513 URL: http://svn.gna.org/viewcvs/gnustep?rev=40513&view=rev Log: Add DBusMenu to the default build if -gui is installed
Modified: libs/dbuskit/trunk/Bundles/DBusMenu/DKMenuRegistry.m libs/dbuskit/trunk/Bundles/DBusMenu/GNUmakefile libs/dbuskit/trunk/GNUmakefile libs/dbuskit/trunk/configure libs/dbuskit/trunk/configure.ac Modified: libs/dbuskit/trunk/Bundles/DBusMenu/DKMenuRegistry.m URL: http://svn.gna.org/viewcvs/gnustep/libs/dbuskit/trunk/Bundles/DBusMenu/DKMenuRegistry.m?rev=40513&r1=40512&r2=40513&view=diff ============================================================================== --- libs/dbuskit/trunk/Bundles/DBusMenu/DKMenuRegistry.m (original) +++ libs/dbuskit/trunk/Bundles/DBusMenu/DKMenuRegistry.m Tue May 23 20:19:26 2017 @@ -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])) { Modified: libs/dbuskit/trunk/Bundles/DBusMenu/GNUmakefile URL: http://svn.gna.org/viewcvs/gnustep/libs/dbuskit/trunk/Bundles/DBusMenu/GNUmakefile?rev=40513&r1=40512&r2=40513&view=diff ============================================================================== --- libs/dbuskit/trunk/Bundles/DBusMenu/GNUmakefile (original) +++ libs/dbuskit/trunk/Bundles/DBusMenu/GNUmakefile Tue May 23 20:19:26 2017 @@ -6,9 +6,12 @@ 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 Modified: libs/dbuskit/trunk/GNUmakefile URL: http://svn.gna.org/viewcvs/gnustep/libs/dbuskit/trunk/GNUmakefile?rev=40513&r1=40512&r2=40513&view=diff ============================================================================== --- libs/dbuskit/trunk/GNUmakefile (original) +++ libs/dbuskit/trunk/GNUmakefile Tue May 23 20:19:26 2017 @@ -39,7 +39,7 @@ Tools ifeq ($(strip $(BUILD_GLOBAL_MENU_BUNDLE)),1) -# SUBPROJECTS += Bundles/DBusMenu +SUBPROJECTS += Bundles/DBusMenu endif ifeq ($(strip $(BUILD_NOTIFICATION_BUNDLE)),1) Modified: libs/dbuskit/trunk/configure URL: http://svn.gna.org/viewcvs/gnustep/libs/dbuskit/trunk/configure?rev=40513&r1=40512&r2=40513&view=diff ============================================================================== --- libs/dbuskit/trunk/configure (original) +++ libs/dbuskit/trunk/configure Tue May 23 20:19:26 2017 @@ -11610,22 +11610,8 @@ 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 @@ 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 Modified: libs/dbuskit/trunk/configure.ac URL: http://svn.gna.org/viewcvs/gnustep/libs/dbuskit/trunk/configure.ac?rev=40513&r1=40512&r2=40513&view=diff ============================================================================== --- libs/dbuskit/trunk/configure.ac (original) +++ libs/dbuskit/trunk/configure.ac Tue May 23 20:19:26 2017 @@ -138,14 +138,11 @@ 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 _______________________________________________ Gnustep-cvs mailing list Gnustep-cvs@gna.org https://mail.gna.org/listinfo/gnustep-cvs