Colors: remove upstreamed patch

haiku-apps/colors/colors-2.3.recipe

@@ -11,7 +11,7 @@ The Features:
  * With an eye-dropper tool you can pick a color from anywhere on your desktop.
 	"
 HOMEPAGE="https://github.com/jscipione/Colors"
-SRC_URI="git://github.com/jscipione/Colors#a6fcf2688d7b7500e73be68fc00f60db858d8ac2"
+SRC_URI="git://github.com/jscipione/Colors#9d832d2c995f822e6386223cb36840743c7e886a"
 COPYRIGHT="
 	2001-2008 Werner Freytag
 	2009-2013 John Scipione
@@ -23,7 +23,7 @@ ARCHITECTURES="x86_gcc2 x86 ?x86_64"
 SECONDARY_ARCHITECTURES="x86_gcc2 x86"
 
 PROVIDES="
-	colors = $portVersion
+	colors$secondaryArchSuffix = $portVersion
 	app:Colors = $portVersion
 	"
 REQUIRES=""
@@ -37,8 +37,6 @@ BUILD_PREREQUIRES="
 	cmd:mkdepend
 	"
 
-PATCHES="colors-2.3.patch"
-
 BUILD()
 {
 	make $jobArgs OBJ_DIR=objects

haiku-apps/colors/patches/colors-2.3.patch

@@ -1,178 +0,0 @@
-From 997b497e1c9b28015cc415bab6c6155ff24ec985 Mon Sep 17 00:00:00 2001
-From: Sergei Reznikov <diver@gelios.net>
-Date: Thu, 27 Nov 2014 16:29:47 +0300
-Subject: [PATCH] add Makefile
-
----
- Makefile | 159 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
- 1 file changed, 159 insertions(+)
- create mode 100644 Makefile
-
-diff --git a/Makefile b/Makefile
-new file mode 100644
-index 0000000..e47fb91
---- /dev/null
-+++ b/Makefile
-@@ -0,0 +1,159 @@
-+## BeOS Generic Makefile v2.5 ##
-+
-+## Fill in this file to specify the project being created, and the referenced
-+## makefile-engine will do all of the hard work for you.  This handles both
-+## Intel and PowerPC builds of the BeOS and Haiku.
-+
-+## Application Specific Settings ---------------------------------------------
-+
-+# specify the name of the binary
-+NAME= Colors
-+
-+# specify the type of binary
-+#	APP:	Application
-+#	SHARED:	Shared library or add-on
-+#	STATIC:	Static library archive
-+#	DRIVER: Kernel Driver
-+TYPE= APP
-+
-+# 	if you plan to use localization features 
-+# 	specify the application MIME siganture
-+APP_MIME_SIG= application/x-vnd.Haiku-Colors!
-+
-+#	add support for new Pe and Eddie features
-+#	to fill in generic makefile
-+
-+#%{
-+# @src->@ 
-+
-+#	specify the source files to use
-+#	full paths or paths relative to the makefile can be included
-+# 	all files, regardless of directory, will have their object
-+#	files created in the common object directory.
-+#	Note that this means this makefile will not work correctly
-+#	if two source files with the same name (source.c or source.cpp)
-+#	are included from different directories.  Also note that spaces
-+#	in folder names do not work well with this makefile.
-+SRCS= BackgroundView.cpp \
-+		ColorContainer.cpp \
-+		ColorContainersView.cpp \
-+		ColorField.cpp \
-+		ColorPickerView.cpp \
-+		ColorPreview.cpp \
-+		ColorsApplication.cpp \
-+		ColorSelector.cpp \
-+		ColorSlider.cpp \
-+		ColorsWindow.cpp \
-+		convert_rgb_hsv.cpp \
-+		EyeDropper.cpp \
-+		ForeBackSelector.cpp \
-+		OutOfGamutSelector.cpp \
-+		WebSafeSelector.cpp
-+
-+#	specify the resource definition files to use
-+#	full path or a relative path to the resource file can be used.
-+RDEFS= Colors.rdef
-+	
-+#	specify the resource files to use. 
-+#	full path or a relative path to the resource file can be used.
-+#	both RDEFS and RSRCS can be defined in the same makefile.
-+RSRCS= Pipettes.rsrc
-+
-+# @<-src@ 
-+#%}
-+
-+#	end support for Pe and Eddie
-+
-+#	specify additional libraries to link against
-+#	there are two acceptable forms of library specifications
-+#	-	if your library follows the naming pattern of:
-+#		libXXX.so or libXXX.a you can simply specify XXX
-+#		library: libbe.so entry: be
-+#
-+#	-	for version-independent linking of standard C++ libraries please add
-+#		$(STDCPPLIBS) instead of raw "stdc++[.r4] [supc++]" library names
-+#
-+#	-	for localization support add following libs:
-+#		locale localestub
-+#		
-+#	- 	if your library does not follow the standard library
-+#		naming scheme you need to specify the path to the library
-+#		and it's name
-+#		library: my_lib.a entry: my_lib.a or path/my_lib.a
-+LIBS= be $(STDCPPLIBS) textencoding tracker
-+
-+#	specify additional paths to directories following the standard
-+#	libXXX.so or libXXX.a naming scheme.  You can specify full paths
-+#	or paths relative to the makefile.  The paths included may not
-+#	be recursive, so include all of the paths where libraries can
-+#	be found.  Directories where source files are found are
-+#	automatically included.
-+LIBPATHS= 
-+
-+#	additional paths to look for system headers
-+#	thes use the form: #include <header>
-+#	source file directories are NOT auto-included here
-+#SYSTEM_INCLUDE_PATHS= /boot/develop/headers/be /boot/develop/headers/cpp /boot/develop/headers/posix /boot/develop/lib /boot/beos/system/lib
-+
-+#	additional paths to look for local headers
-+#	thes use the form: #include "header"
-+#	source file directories are automatically included
-+LOCAL_INCLUDE_PATHS= 
-+
-+#	specify the level of optimization that you desire
-+#	NONE, SOME, FULL
-+OPTIMIZE= FULL
-+
-+# 	specify here the codes for languages you are going
-+# 	to support in this application. The default "en"
-+# 	one must be provided too. "make catkeys" will recreate only
-+# 	locales/en.catkeys file. Use it as template for creating other
-+# 	languages catkeys. All localization files must be placed
-+# 	in "locales" sub-directory.
-+LOCALES=
-+
-+#	specify any preprocessor symbols to be defined.  The symbols will not
-+#	have their values set automatically; you must supply the value (if any)
-+#	to use.  For example, setting DEFINES to "DEBUG=1" will cause the
-+#	compiler option "-DDEBUG=1" to be used.  Setting DEFINES to "DEBUG"
-+#	would pass "-DDEBUG" on the compiler's command line.
-+DEFINES= 
-+
-+#	specify special warning levels
-+#	if unspecified default warnings will be used
-+#	NONE = supress all warnings
-+#	ALL = enable all warnings
-+WARNINGS = 
-+
-+#	specify whether image symbols will be created
-+#	so that stack crawls in the debugger are meaningful
-+#	if TRUE symbols will be created
-+SYMBOLS = 
-+
-+#	specify debug settings
-+#	if TRUE will allow application to be run from a source-level
-+#	debugger.  Note that this will disable all optimzation.
-+DEBUGGER = 
-+
-+#	specify additional compiler flags for all files
-+COMPILER_FLAGS= -Woverloaded-virtual -funsigned-bitfields -Wwrite-strings 
-+
-+#	specify additional linker flags
-+LINKER_FLAGS =
-+
-+#	specify the version of this particular item
-+#	(for example, -app 3 4 0 d 0 -short 340 -long "340 "`echo -n -e '\302\251'`"1999 GNU GPL") 
-+#	This may also be specified in a resource.
-+APP_VERSION = 
-+
-+#	(for TYPE == DRIVER only) Specify desired location of driver in the /dev
-+#	hierarchy. Used by the driverinstall rule. E.g., DRIVER_PATH = video/usb will
-+#	instruct the driverinstall rule to place a symlink to your driver's binary in
-+#	~/add-ons/kernel/drivers/dev/video/usb, so that your driver will appear at
-+#	/dev/video/usb when loaded. Default is "misc".
-+DRIVER_PATH = 
-+
-+## include the makefile-engine
-+DEVEL_DIRECTORY := \
-+	$(shell findpaths -r "makefile_engine" B_FIND_PATH_DEVELOP_DIRECTORY)
-+include $(DEVEL_DIRECTORY)/etc/makefile-engine
--- 
-1.8.3.4
-