haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-22 19:50:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

Update paladin patch to remove liblocale references

Browse Source 
resolves issue #9

(cherry picked from commit 0bad405391)
This commit is contained in:
Chris Roberts
2013-07-26 16:16:32 -06:00
committed by Oliver Tappe
parent 2bfeb67002
commit 31c3ecec74
1 changed files with 21 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
haiku-apps/paladin/patches/paladin-1.3.patch
View File

@@ -114,3 +114,24 @@ diff -urN Paladin-1.3.src/SymbolFinder/Makefile Paladin-1.3.src.gcc2hybrid/Symbo
+
+## include the makefile-engine
+include $(BUILDHOME)/etc/makefile-engine
diff -urN Paladin-1.3.src/Paladin/buildhaikugcc2.sh Paladin-1.3.src/Paladin/buildhaikugcc2.sh-
--- Paladin-1.3.src/Paladin/buildhaikugcc2.sh 2013-07-19 18:41:25.292028416 +0200
+++ Paladin-1.3.src/Paladin/buildhaikugcc2.sh- 2013-07-19 18:38:29.508035072 +0200
@@ -1,5 +1,5 @@
#!/bin/sh
-gcc -pipe -D_ZETA_TS_FIND_DIR_ -o Paladin AboutWindow.cpp AddNewFileWindow.cpp AppDebug.cpp DebugTools.cpp ErrorWindow.cpp FileActions.cpp FileUtils.cpp FindOpenFileWindow.cpp Globals.cpp GroupRenameWindow.cpp LibWindow.cpp Makemake.cpp Paladin.cpp PrefsWindow.cpp Project.cpp ProjectList.cpp ProjectPath.cpp ProjectSettingsWindow.cpp ProjectWindow.cpp RunArgsWindow.cpp StartWindow.cpp TemplateManager.cpp TemplateWindow.cpp TerminalWindow.cpp AsciiWindow.cpp CodeLib.cpp CodeLibWindow.cpp LicenseManager.cpp VRegWindow.cpp BuildSystem/BuildInfo.cpp BuildSystem/ErrorParser.cpp BuildSystem/FileFactory.cpp BuildSystem/ProjectBuilder.cpp BuildSystem/SourceFile.cpp BuildSystem/SourceType.cpp BuildSystem/SourceTypeC.cpp BuildSystem/SourceTypeLex.cpp BuildSystem/SourceTypeLib.cpp BuildSystem/SourceTypeResource.cpp BuildSystem/SourceTypeRez.cpp BuildSystem/SourceTypeShell.cpp BuildSystem/SourceTypeYacc.cpp BuildSystem/StatCache.cpp ThirdParty/AutoTextControl.cpp ThirdParty/BeIDEProject.cpp ThirdParty/BitmapButton.cpp ThirdParty/CRegex.cpp ThirdParty/ClickableStringView.cpp ThirdParty/DListView.cpp ThirdParty/DNode.cpp ThirdParty/DPath.cpp ThirdParty/DWindow.cpp ThirdParty/DelayedMessenger.cpp ThirdParty/GetTextWindow.cpp ThirdParty/LaunchHelper.cpp ThirdParty/PathBox.cpp ThirdParty/Settings.cpp ThirdParty/StringInputWindow.cpp ThirdParty/TextFile.cpp ThirdParty/TypedRefFilter.cpp SourceControl/GitSourceControl.cpp SourceControl/HgSourceControl.cpp SourceControl/SCMImportWindow.cpp SourceControl/SCMImporter.cpp SourceControl/SCMManager.cpp SourceControl/SCMOutputWindow.cpp SourceControl/SVNSourceControl.cpp SourceControl/SourceControl.cpp -I ./BuildSystem -I ./ -I ./ThirdParty -I ./SourceControl -lbe -lroot -ltracker -ltranslation -lpcre -llocale
+gcc -pipe -D_ZETA_TS_FIND_DIR_ -o Paladin AboutWindow.cpp AddNewFileWindow.cpp AppDebug.cpp DebugTools.cpp ErrorWindow.cpp FileActions.cpp FileUtils.cpp FindOpenFileWindow.cpp Globals.cpp GroupRenameWindow.cpp LibWindow.cpp Makemake.cpp Paladin.cpp PrefsWindow.cpp Project.cpp ProjectList.cpp ProjectPath.cpp ProjectSettingsWindow.cpp ProjectWindow.cpp RunArgsWindow.cpp StartWindow.cpp TemplateManager.cpp TemplateWindow.cpp TerminalWindow.cpp AsciiWindow.cpp CodeLib.cpp CodeLibWindow.cpp LicenseManager.cpp VRegWindow.cpp BuildSystem/BuildInfo.cpp BuildSystem/ErrorParser.cpp BuildSystem/FileFactory.cpp BuildSystem/ProjectBuilder.cpp BuildSystem/SourceFile.cpp BuildSystem/SourceType.cpp BuildSystem/SourceTypeC.cpp BuildSystem/SourceTypeLex.cpp BuildSystem/SourceTypeLib.cpp BuildSystem/SourceTypeResource.cpp BuildSystem/SourceTypeRez.cpp BuildSystem/SourceTypeShell.cpp BuildSystem/SourceTypeYacc.cpp BuildSystem/StatCache.cpp ThirdParty/AutoTextControl.cpp ThirdParty/BeIDEProject.cpp ThirdParty/BitmapButton.cpp ThirdParty/CRegex.cpp ThirdParty/ClickableStringView.cpp ThirdParty/DListView.cpp ThirdParty/DNode.cpp ThirdParty/DPath.cpp ThirdParty/DWindow.cpp ThirdParty/DelayedMessenger.cpp ThirdParty/GetTextWindow.cpp ThirdParty/LaunchHelper.cpp ThirdParty/PathBox.cpp ThirdParty/Settings.cpp ThirdParty/StringInputWindow.cpp ThirdParty/TextFile.cpp ThirdParty/TypedRefFilter.cpp SourceControl/GitSourceControl.cpp SourceControl/HgSourceControl.cpp SourceControl/SCMImportWindow.cpp SourceControl/SCMImporter.cpp SourceControl/SCMManager.cpp SourceControl/SCMOutputWindow.cpp SourceControl/SVNSourceControl.cpp SourceControl/SourceControl.cpp -I ./BuildSystem -I ./ -I ./ThirdParty -I ./SourceControl -lbe -lroot -ltracker -ltranslation -lpcre
xres -o Paladin Paladin.rsrc
mimeset -all Paladin
diff -urN Paladin-1.3.src/Paladin/buildhaikugcc4.sh Paladin-1.3.src/Paladin/buildhaikugcc4.sh-
--- Paladin-1.3.src/Paladin/buildhaikugcc4.sh 2013-07-19 18:41:14.299368448 +0200
+++ Paladin-1.3.src/Paladin/buildhaikugcc4.sh- 2013-07-19 18:38:34.475004928 +0200
@@ -1,5 +1,5 @@
#!/bin/sh
-gcc -pipe -D_ZETA_TS_FIND_DIR_ -o Paladin AboutWindow.cpp AddNewFileWindow.cpp AppDebug.cpp DebugTools.cpp ErrorWindow.cpp FileActions.cpp FileUtils.cpp FindOpenFileWindow.cpp Globals.cpp GroupRenameWindow.cpp LibWindow.cpp Makemake.cpp Paladin.cpp PrefsWindow.cpp Project.cpp ProjectList.cpp ProjectPath.cpp ProjectSettingsWindow.cpp ProjectWindow.cpp RunArgsWindow.cpp StartWindow.cpp TemplateManager.cpp TemplateWindow.cpp TerminalWindow.cpp AsciiWindow.cpp CodeLib.cpp CodeLibWindow.cpp LicenseManager.cpp VRegWindow.cpp BuildSystem/BuildInfo.cpp BuildSystem/ErrorParser.cpp BuildSystem/FileFactory.cpp BuildSystem/ProjectBuilder.cpp BuildSystem/SourceFile.cpp BuildSystem/SourceType.cpp BuildSystem/SourceTypeC.cpp BuildSystem/SourceTypeLex.cpp BuildSystem/SourceTypeLib.cpp BuildSystem/SourceTypeResource.cpp BuildSystem/SourceTypeRez.cpp BuildSystem/SourceTypeShell.cpp BuildSystem/SourceTypeYacc.cpp BuildSystem/StatCache.cpp ThirdParty/AutoTextControl.cpp ThirdParty/BeIDEProject.cpp ThirdParty/BitmapButton.cpp ThirdParty/CRegex.cpp ThirdParty/ClickableStringView.cpp ThirdParty/DListView.cpp ThirdParty/DNode.cpp ThirdParty/DPath.cpp ThirdParty/DWindow.cpp ThirdParty/DelayedMessenger.cpp ThirdParty/GetTextWindow.cpp ThirdParty/LaunchHelper.cpp ThirdParty/PathBox.cpp ThirdParty/Settings.cpp ThirdParty/StringInputWindow.cpp ThirdParty/TextFile.cpp ThirdParty/TypedRefFilter.cpp SourceControl/GitSourceControl.cpp SourceControl/HgSourceControl.cpp SourceControl/SCMImportWindow.cpp SourceControl/SCMImporter.cpp SourceControl/SCMManager.cpp SourceControl/SCMOutputWindow.cpp SourceControl/SVNSourceControl.cpp SourceControl/SourceControl.cpp -I ./BuildSystem -I ./ -I ./ThirdParty -I ./SourceControl -lbe -lroot -ltracker -ltranslation -lsupc++ -lstdc++ -lpcre -llocale
+gcc -pipe -D_ZETA_TS_FIND_DIR_ -o Paladin AboutWindow.cpp AddNewFileWindow.cpp AppDebug.cpp DebugTools.cpp ErrorWindow.cpp FileActions.cpp FileUtils.cpp FindOpenFileWindow.cpp Globals.cpp GroupRenameWindow.cpp LibWindow.cpp Makemake.cpp Paladin.cpp PrefsWindow.cpp Project.cpp ProjectList.cpp ProjectPath.cpp ProjectSettingsWindow.cpp ProjectWindow.cpp RunArgsWindow.cpp StartWindow.cpp TemplateManager.cpp TemplateWindow.cpp TerminalWindow.cpp AsciiWindow.cpp CodeLib.cpp CodeLibWindow.cpp LicenseManager.cpp VRegWindow.cpp BuildSystem/BuildInfo.cpp BuildSystem/ErrorParser.cpp BuildSystem/FileFactory.cpp BuildSystem/ProjectBuilder.cpp BuildSystem/SourceFile.cpp BuildSystem/SourceType.cpp BuildSystem/SourceTypeC.cpp BuildSystem/SourceTypeLex.cpp BuildSystem/SourceTypeLib.cpp BuildSystem/SourceTypeResource.cpp BuildSystem/SourceTypeRez.cpp BuildSystem/SourceTypeShell.cpp BuildSystem/SourceTypeYacc.cpp BuildSystem/StatCache.cpp ThirdParty/AutoTextControl.cpp ThirdParty/BeIDEProject.cpp ThirdParty/BitmapButton.cpp ThirdParty/CRegex.cpp ThirdParty/ClickableStringView.cpp ThirdParty/DListView.cpp ThirdParty/DNode.cpp ThirdParty/DPath.cpp ThirdParty/DWindow.cpp ThirdParty/DelayedMessenger.cpp ThirdParty/GetTextWindow.cpp ThirdParty/LaunchHelper.cpp ThirdParty/PathBox.cpp ThirdParty/Settings.cpp ThirdParty/StringInputWindow.cpp ThirdParty/TextFile.cpp ThirdParty/TypedRefFilter.cpp SourceControl/GitSourceControl.cpp SourceControl/HgSourceControl.cpp SourceControl/SCMImportWindow.cpp SourceControl/SCMImporter.cpp SourceControl/SCMManager.cpp SourceControl/SCMOutputWindow.cpp SourceControl/SVNSourceControl.cpp SourceControl/SourceControl.cpp -I ./BuildSystem -I ./ -I ./ThirdParty -I ./SourceControl -lbe -lroot -ltracker -ltranslation -lsupc++ -lstdc++ -lpcre
xres -o Paladin Paladin.rsrc
mimeset -all Paladin