package/gnustep/etoile/hotfix.patch

   1 # --- T2-COPYRIGHT-NOTE-BEGIN ---
   2 # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
   3 #
   4 # T2 SDE: package/.../etoile/compile.patch
   5 # Copyright (C) 2007 The T2 SDE Project
   6 #
   7 # More information can be found in the files COPYING and README.
   8 #
   9 # This patch file is dual-licensed. It is available under the license the
  10 # patched project is licensed under, as long as it is an OpenSource license
  11 # as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
  12 # of the GNU General Public License as published by the Free Software
  13 # Foundation; either version 2 of the License, or (at your option) any later
  14 # version.
  15 # --- T2-COPYRIGHT-NOTE-END ---
  16
  17 --- Etoile-0.2/Frameworks/PopplerKit/bindings/poppler.cc.vanilla        2007-11-19 20:13:10.000000000 +0100
  18 +++ Etoile-0.2/Frameworks/PopplerKit/bindings/poppler.cc        2007-11-19 20:13:26.000000000 +0100
  19 @@ -123,7 +123,7 @@
  20           fflush(stderr);
  21        }
  22
  23 -      globalParams = new GlobalParams(NULL);
  24 +      globalParams = new GlobalParams();
  25  #ifdef POPPLER_0_4
  26        globalParams->setupBaseFontsFc(NULL);
  27  #endif
  28 --- Etoile-0.2/Frameworks/XWindowServerKit/GNUmakefile.vanilla  2007-11-19 20:39:53.000000000 +0100
  29 +++ Etoile-0.2/Frameworks/XWindowServerKit/GNUmakefile  2007-11-19 20:40:01.000000000 +0100
  30 @@ -19,7 +19,7 @@
  31  XWindowServerKit_RESOURCE_FILES = ScriptingInfo.plist
  32
  33  ADDITIONAL_INCLUDE_DIRS += -I/usr/X11R6/include
  34 -ADDITIONAL_LIB_DIRS += -L/usr/X11R6/lib -lX11
  35 +ADDITIONAL_LIB_DIRS += $(shell  pkg-config x11 --libs)
  36
  37  include $(GNUSTEP_MAKEFILES)/aggregate.make
  38  include ../../etoile.make
  39 --- Etoile-0.2/Bundles/EtoileWildMenus/NSMenuView+Hackery.m.vanilla     2007-11-19 20:18:23.000000000 +0100
  40 +++ Etoile-0.2/Bundles/EtoileWildMenus/NSMenuView+Hackery.m     2007-11-19 20:18:45.000000000 +0100
  41 @@ -25,6 +25,7 @@
  42
  43  #import <AppKit/NSApplication.h>
  44  #import <AppKit/PSOperators.h>
  45 +#import <AppKit/NSEvent.h>
  46
  47  #import "EtoileMenuTitleView.h"
  48  #import "MenuBarHeight.h"
  49 --- Etoile-0.2/Bundles/GNUmakefile.vanilla      2007-11-19 20:23:46.000000000 +0100
  50 +++ Etoile-0.2/Bundles/GNUmakefile      2007-11-19 20:43:00.000000000 +0100
  51 @@ -57,7 +57,7 @@
  52  endif
  53
  54  ifeq ($(volumecontrolmenulet), yes)
  55 -    SUBPROJECTS += VolumeControlMenulet
  56 +    #SUBPROJECTS += VolumeControlMenulet
  57  endif
  58
  59  include $(GNUSTEP_MAKEFILES)/aggregate.make
  60 --- Etoile-0.2/Services/Private/Idle/GNUmakefile.vanilla        2007-11-19 20:45:26.000000000 +0100
  61 +++ Etoile-0.2/Services/Private/Idle/GNUmakefile        2007-11-19 20:46:46.000000000 +0100
  62 @@ -25,7 +25,7 @@
  63
  64  ADDITIONAL_OBJCFLAGS = -std=c99 -g -Werror
  65  ADDITIONAL_INCLUDE_DIRS += -I/usr/X11R6/include
  66 -ADDITIONAL_LIB_DIRS += -L/usr/X11R6/lib -lX11 -lXss
  67 +ADDITIONAL_LIB_DIRS += $(shell pkg-config x11 --libs) -lXss
  68
  69  include $(GNUSTEP_MAKEFILES)/tool.make
  70  -include ../../../etoile.make
  71 --- Etoile-0.2/Services/Private/Corner/GNUmakefile.vanilla      2007-11-19 20:45:07.000000000 +0100
  72 +++ Etoile-0.2/Services/Private/Corner/GNUmakefile      2007-11-19 20:45:14.000000000 +0100
  73 @@ -24,7 +24,7 @@
  74
  75  ADDITIONAL_OBJCFLAGS = -std=c99 -g -Werror
  76  ADDITIONAL_INCLUDE_DIRS += -I/usr/X11R6/include
  77 -ADDITIONAL_LIB_DIRS += -L/usr/X11R6/lib -lX11
  78 +ADDITIONAL_LIB_DIRS += $(shell  pkg-config x11 --libs)
  79  ADDITIONAL_LDFLAGS += -lStepTalk -g
  80
  81  include $(GNUSTEP_MAKEFILES)/tool.make
  82 --- Etoile-0.2/Services/Private/AZBackground/GNUmakefile.vanilla        2007-11-19 20:43:28.000000000 +0100
  83 +++ Etoile-0.2/Services/Private/AZBackground/GNUmakefile        2007-11-19 20:43:41.000000000 +0100
  84 @@ -14,7 +14,7 @@
  85  ADDITIONAL_INCLUDE_DIRS += -I/usr/include -I/usr/X11R6/include
  86
  87  ADDITIONAL_LIB_DIRS += \
  88 -       -L/usr/lib -L/usr/X11R6/lib -lX11 -lXWindowServerKit
  89 +       -L/usr/lib $(shell pkg-config x11 --libs) -lXWindowServerKit
  90
  91  ADDITIONAL_GUI_LIBS +=
  92
  93 --- Etoile-0.2/Services/Private/Login/GNUmakefile.vanilla       2007-11-19 20:44:47.000000000 +0100
  94 +++ Etoile-0.2/Services/Private/Login/GNUmakefile       2007-11-19 20:44:54.000000000 +0100
  95 @@ -22,7 +22,7 @@
  96
  97  Login_MAIN_MODEL_FILE = login.gorm
  98
  99 -ADDITIONAL_LDFLAGS = -lX11
 100 +ADDITIONAL_LDFLAGS = $(shell  pkg-config x11 --libs)
 101
 102  include $(GNUSTEP_MAKEFILES)/application.make
 103  include ../../../etoile.make
 104 --- Etoile-0.2/Services/Private/AZSwitch/GNUmakefile.vanilla    2007-11-19 20:47:02.000000000 +0100
 105 +++ Etoile-0.2/Services/Private/AZSwitch/GNUmakefile    2007-11-19 20:47:28.000000000 +0100
 106 @@ -16,7 +16,7 @@
 107         -I/usr/X11R6/include
 108
 109  ADDITIONAL_LIB_DIRS += \
 110 -       -L/usr/X11R6/lib -lX11 \
 111 +       $(shell pkg-config x11 --libs) \
 112         -lXWindowServerKit \
 113         -lEtoileUI
 114
 115 --- Etoile-0.2/Services/Private/AZDock/GNUmakefile.vanilla      2007-11-19 20:44:13.000000000 +0100
 116 +++ Etoile-0.2/Services/Private/AZDock/GNUmakefile      2007-11-19 20:44:20.000000000 +0100
 117 @@ -25,7 +25,7 @@
 118  ADDITIONAL_INCLUDE_DIRS += -I/usr/include -I/usr/X11R6/include
 119
 120  ADDITIONAL_LIB_DIRS += \
 121 -       -L/usr/lib -L/usr/X11R6/lib
 122 +       -L/usr/lib $(shell  pkg-config x11 --libs)
 123
 124  ADDITIONAL_GUI_LIBS += \
 125         -lX11 \