From 25e8a8ce9a5b1dbaad02fb7f299fb9b1d6925a30 Mon Sep 17 00:00:00 2001 From: Schrijvers Luc Date: Sat, 12 Aug 2023 07:11:01 +0000 Subject: [PATCH] masterpiece, revbump for python, switch SOURCE_URI (#9175) --- .../masterpiece/masterpiece-r742.recipe | 35 ++-- .../patches/masterpiece-r742.patch | 164 ------------------ 2 files changed, 18 insertions(+), 181 deletions(-) delete mode 100644 haiku-apps/masterpiece/patches/masterpiece-r742.patch diff --git a/haiku-apps/masterpiece/masterpiece-r742.recipe b/haiku-apps/masterpiece/masterpiece-r742.recipe index ce456e738..3e17c2d3a 100644 --- a/haiku-apps/masterpiece/masterpiece-r742.recipe +++ b/haiku-apps/masterpiece/masterpiece-r742.recipe @@ -1,21 +1,21 @@ SUMMARY="New way to create opendocument compatible books/documents" -DESCRIPTION=" -This is an attempt to create a new way to create documents or books. It moves \ -away from the WYSIWYG paradigm of microsoft word, openoffice, etc. etc. etc. \ -It takes a more keyboard only, thought flowing and typing markup language, \ -object oriented approach where a user who has ideas or thoughts can jot these \ -down and have them go into a list. to build their document/book, they would \ -then order the list of thoughts, images, tables, etc. into the correct order \ -and preview/publish their book." +DESCRIPTION="This is an attempt to create a new way to create documents or books. It moves \ +away from the WYSIWYG paradigm of microsoft word, openoffice, etc. etc. etc. It takes a more \ +keyboard only, thought flowing and typing markup language, object oriented approach where a user \ +who has ideas or thoughts can jot these down and have them go into a list. to build their \ +document/book, they would then order the list of thoughts, images, tables, etc. into the correct \ +order and preview/publish their book." HOMEPAGE="http://code.google.com/p/masterpiece/" COPYRIGHT="2010-2012 Pasquale J. Rinaldi, Jr." LICENSE="MIT" -REVISION="2" -SOURCE_URI="svn+http://masterpiece.googlecode.com/svn/trunk#r742" -PATCHES="masterpiece-r742.patch" +REVISION="3" +srcGitRev="28ae6767934b397bd3dd5ae080811e2a555d4ada" +SOURCE_URI="https://github.com/Begasus/masterpiece/archive/$srcGitRev.tar.gz" +CHECKSUM_SHA256="5d207f97e1d8b9b2b1bcfb6c4690a974d69fb806f1f56fe4e57ad4bd2498428d" +SOURCE_DIR="masterpiece-$srcGitRev" -ARCHITECTURES="?all x86_gcc2 !x86" -SECONDARY_ARCHITECTURES="x86_gcc2 !x86" +ARCHITECTURES="?all ?x86_gcc2" +SECONDARY_ARCHITECTURES="?x86_gcc2 ?x86" PROVIDES=" masterpiece$secondaryArchSuffix = $portVersion @@ -23,14 +23,14 @@ PROVIDES=" " REQUIRES=" haiku$secondaryArchSuffix - lib:liblayout - lib:libpython2.7 + lib:liblayout$secondaryArchSuffix + lib:libpython3.10$secondaryArchSuffix lib:libsqlite3$secondaryArchSuffix " BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel - devel:libpython2.7 + devel:libpython3.10$secondaryArchSuffix devel:libsqlite3$secondaryArchSuffix " BUILD_PREREQUIRES=" @@ -48,8 +48,9 @@ BUILD() INSTALL() { - mkdir -p $appsDir + mkdir -p $appsDir $docDir cp objects/MasterPiece $appsDir + cp *.html $docDir addAppDeskbarSymlink $appsDir/MasterPiece } diff --git a/haiku-apps/masterpiece/patches/masterpiece-r742.patch b/haiku-apps/masterpiece/patches/masterpiece-r742.patch deleted file mode 100644 index 0d5103c15..000000000 --- a/haiku-apps/masterpiece/patches/masterpiece-r742.patch +++ /dev/null @@ -1,164 +0,0 @@ -diff -Pur masterpiece/CommonFunctions.cpp masterpiece-haiku/CommonFunctions.cpp ---- masterpiece/CommonFunctions.cpp 2014-12-05 16:06:41.210736548 +0100 -+++ masterpiece-haiku/CommonFunctions.cpp 2014-12-05 16:10:44.720736102 +0100 -@@ -287,8 +287,8 @@ - int sqlValue; - BString tmpString; - sqlErrMsg = 0; -- BString tmpPath = GetAppDirPath(); // for testing purposes, use local one. -- //BString tmpPath = GetUserDirPath(); // for publish purposes, use real location -+ //BString tmpPath = GetAppDirPath(); // for testing purposes, use local one. -+ BString tmpPath = GetUserDirPath(); // for publish purposes, use real location - if(tmpPath != "-15") - { - tmpPath += "/MasterPiece.db"; -diff -Pur masterpiece/Makefile masterpiece-haiku/Makefile ---- masterpiece/Makefile 1970-01-01 01:00:00.000000000 +0100 -+++ masterpiece-haiku/Makefile 2014-12-05 16:09:36.420736227 +0100 -@@ -0,0 +1,146 @@ -+## 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= MasterPiece -+ -+# 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= -+ -+#        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= AboutWindow.cpp App.cpp BuilderButton.cpp BuilderListView.cpp \ -+CommonFunctions.cpp EditIdeaName.cpp EditorTextView.cpp HelperWindows.cpp \ -+HelpStringItem.cpp IdeaStringItem.cpp MainMenu.cpp MarkupWindow.cpp \ -+MPBuilder.cpp MPEditor.cpp MPLauncher.cpp PublishFilePanel.cpp SaveIdea.cpp -+ -+#        specify the resource definition files to use -+#        full path or a relative path to the resource file can be used. -+RDEFS= Resources.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= Resources.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=root be sqlite3 $(STDCPPLIBS) python2.7 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
-+#        source file directories are NOT auto-included here -+SYSTEM_INCLUDE_PATHS= -+ -+#        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= -+ -+#         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= -g -+ -+#        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 -+include $(BUILDHOME)/etc/makefile-engine