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

PecoRename: update SRC_URI to latest commit and remove upstreamed patch

Browse Source
This commit is contained in:
Sergei Reznikov
2014-10-31 01:47:42 +03:00
parent 137666edf0
commit 86253fe431
2 changed files with 2 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
haiku-apps/pecorename/patches/pecorename-1.5.patch
View File

@@ -1,63 +0,0 @@
From 94174525029023155f8870495b23765da7b6f754 Mon Sep 17 00:00:00 2001
From: Sergei Reznikov <diver@gelios.net>
Date: Sat, 25 Oct 2014 12:33:31 +0400
Subject: [PATCH] Fix paths in Makefiles
---
trunk/Main/Makefile | 18 ++++++++++++++----
trunk/Tracker Add-On/Makefile | 8 +++++++-
2 files changed, 21 insertions(+), 5 deletions(-)
diff --git a/trunk/Main/Makefile b/trunk/Main/Makefile
index 52564e9..76bd5dd 100644
--- a/trunk/Main/Makefile
+++ b/trunk/Main/Makefile
@@ -1,10 +1,14 @@
NAME= ../PecoRename
TYPE= APP
-SRCS= main.cpp constants.cpp functions.cpp BottomView.cpp Fenster.cpp FileListItem.cpp FileListView.cpp FileView.cpp LiveTextControl.cpp MainView.cpp Panel.cpp PecoApp.cpp ScriptFilePanel.cpp TopView.cpp Renamer.cpp Renamer_SearchReplace.cpp Renamer_InsertReplace.cpp Renamer_Remove.cpp Renamer_Numbering.cpp Renamer_Extension.cpp Renamer_UpperLower.cpp About.cpp
+SRCS= main.cpp constants.cpp functions.cpp BottomView.cpp Fenster.cpp \
+ FileListItem.cpp FileListView.cpp FileView.cpp LiveTextControl.cpp \
+ MainView.cpp Panel.cpp PecoApp.cpp ScriptFilePanel.cpp TopView.cpp \
+ Renamer.cpp Renamer_SearchReplace.cpp Renamer_InsertReplace.cpp \
+ Renamer_Remove.cpp Renamer_Numbering.cpp Renamer_Extension.cpp \
+ Renamer_UpperLower.cpp About.cpp
RSRCS= About.rsrc FileInfo.rsrc
-LIBS= /boot/develop/lib/x86/libbe.so /boot/develop/lib/x86/libstdc++.r4.so /boot/develop/lib/x86/libtextencoding.so /boot/develop/lib/x86/libtracker.so
+LIBS=be textencoding tracker $(STDCPPLIBS)
LIBPATHS=
-SYSTEM_INCLUDE_PATHS= /boot/develop/headers/be /boot/develop/headers/cpp /boot/develop/headers/posix /boot/develop/lib /boot/beos/system/lib
LOCAL_INCLUDE_PATHS=
OPTIMIZE=FULL
# specify any preprocessor symbols to be defined. The symbols will not
@@ -24,4 +28,10 @@ COMPILER_FLAGS=-Woverloaded-virtual -funsigned-bitfields -Wwrite-strings
LINKER_FLAGS=
## include the makefile-engine
-include $(BUILDHOME)/etc/makefile-engine
+DEVEL_DIRECTORY := \
+ $(shell if findpaths > /dev/null 2>&1 ; then \
+ findpaths -r "makefile_engine" B_FIND_PATH_DEVELOP_DIRECTORY ; \
+ else \
+ finddir B_SYSTEM_DEVELOP_DIRECTORY ; \
+ fi)
+include $(DEVEL_DIRECTORY)/etc/makefile-engine
diff --git a/trunk/Tracker Add-On/Makefile b/trunk/Tracker Add-On/Makefile
index 81e2a9a..8b41dfe 100644
--- a/trunk/Tracker Add-On/Makefile
+++ b/trunk/Tracker Add-On/Makefile
@@ -14,4 +14,10 @@ COMPILER_FLAGS=-Woverloaded-virtual -funsigned-bitfields -Wwrite-strings
LINKER_FLAGS=
## include the makefile-engine
-include $(BUILDHOME)/etc/makefile-engine
+DEVEL_DIRECTORY := \
+ $(shell if findpaths > /dev/null 2>&1 ; then \
+ findpaths -r "makefile_engine" B_FIND_PATH_DEVELOP_DIRECTORY ; \
+ else \
+ finddir B_SYSTEM_DEVELOP_DIRECTORY ; \
+ fi)
+include $(DEVEL_DIRECTORY)/etc/makefile-engine
--
1.8.3.4

4
haiku-apps/pecorename/pecorename-1.5.recipe
View File

@@ -20,10 +20,10 @@ Whenever you have to rename some or many files the same way, this is YOUR \
program!
"
HOMEPAGE="http://www.maybe.de/software/pecorename"
SRC_URI="git://github.com/HaikuArchives/PecoRename#7f87bac07671a982d3b126da504220dbe22bcecd"
SRC_URI="git://github.com/HaikuArchives/PecoRename#ac7e6b511b1a24866e4a34fa170023e9a89448fb"
COPYRIGHT="Copyright 2008 Werner Freytag"
LICENSE="MIT"
REVISION="2"
REVISION="3"
ARCHITECTURES="x86_gcc2 !x86 !x86_64"
SECONDARY_ARCHITECTURES="x86_gcc2 !x86"