Attachment #157950 for bug #201024

View | Details | Raw Unified | Return to bug 201024
Collapse All | Expand All

Lines 34-40 Link Here

(-)net-p2p/zetacoin/Makefile (-1 / +2 lines)
34	X11_CONFIGURE_ON= --without-daemon	34	X11_CONFIGURE_ON= --without-daemon
35	X11_CONFIGURE_OFF= --with-daemon	35	X11_CONFIGURE_OFF= --with-daemon
36	X11_BUILD_DEPENDS= protoc:${PORTSDIR}/devel/protobuf	36	X11_BUILD_DEPENDS= protoc:${PORTSDIR}/devel/protobuf
37	X11_USE= qt4=corelib,gui,qmake_build,linguist,uic,moc,rcc,qtestlib_build	37	X11_USE= qt4=corelib,network,gui,qmake_build,linguisttools_build \
		38	qt4=uic_build,moc_build,rcc_build,qtestlib_build
38	X11_USES= desktop-file-utils	39	X11_USES= desktop-file-utils
39		40
40	WALLET_CONFIGURE_ENABLE= wallet	41	WALLET_CONFIGURE_ENABLE= wallet

Lines 1-29 Link Here

(-)net-p2p/zetacoin/files/patch-Makefile_include_editSedCommands.patch (-29 lines)
1	diff --git a/src/Makefile.include b/src/Makefile.include
2	index 2fc6cd7..cdd16f5 100644
3	--- a/src/Makefile.include
4	+++ src/Makefile.include
5	@@ -40,18 +40,18 @@ $(LIBBITCOINQT):
6	ui_%.h: %.ui
7	@test -d $(abs_builddir)/$(@D) \|\| $(MKDIR_P) $(abs_builddir)/$(@D)
8	@test -f $(UIC) && QT_SELECT=$(QT_SELECT) $(UIC) -o $(abs_builddir)/$@ $(abs_srcdir)/$< \|\| echo error: could not build $(abs_builddir)/$@
9	- $(SED) -e '/^\\.*Created:/d' $(abs_builddir)/$@ > $(abs_builddir)/$@.n && mv $(abs_builddir)/$@{.n,}
10	- $(SED) -e '/^\\.*by:/d' $(abs_builddir)/$@ > $(abs_builddir)/$@.n && mv $(abs_builddir)/$@{.n,}
11	+ $(SED) -e '/^\\.*Created:/d' $(abs_builddir)/$@ > $(abs_builddir)/$@.n && mv $(abs_builddir)/$@.n $(abs_builddir)/$@
12	+ $(SED) -e '/^\\.*by:/d' $(abs_builddir)/$@ > $(abs_builddir)/$@.n && mv $(abs_builddir)/$@.n $(abs_builddir)/$@
13
14	%.moc: %.cpp
15	QT_SELECT=$(QT_SELECT) $(MOC) $(QT_INCLUDES) $(MOC_DEFS) -o $@ $<
16	- $(SED) -e '/^\\.*Created:/d' $@ > $@.n && mv $@{.n,}
17	- $(SED) -e '/^\\.*by:/d' $@ > $@.n && mv $@{.n,}
18	+ $(SED) -e '/^\\.*Created:/d' $@ > $@.n && mv $@.n $(abs_builddir)/$@
19	+ $(SED) -e '/^\\.*by:/d' $@ > $@.n && mv $@.n $(abs_builddir)/$@
20
21	moc_%.cpp: %.h
22	QT_SELECT=$(QT_SELECT) $(MOC) $(QT_INCLUDES) $(MOC_DEFS) -o $@ $<
23	- $(SED) -e '/^\\.*Created:/d' $@ > $@.n && mv $@{.n,}
24	- $(SED) -e '/^\\.*by:/d' $@ > $@.n && mv $@{.n,}
25	+ $(SED) -e '/^\\.*Created:/d' $@ > $@.n && mv $@.n $(abs_builddir)/$@
26	+ $(SED) -e '/^\\.*by:/d' $@ > $@.n && mv $@.n $(abs_builddir)/$@
27
28	%.qm: %.ts
29	@test -d $(abs_builddir)/$(@D) \|\| $(MKDIR_P) $(abs_builddir)/$(@D)




diff --git a/src/qt/Makefile.am b/src/qt/Makefile.am
index 648971b..97b2ec4 100644
--- a/src/qt/Makefile.am
+++ src/qt/Makefile.am
@@ -373,7 +373,7 @@ translate: bitcoinstrings.cpp $(QT_FORMS_UI) $(QT_FORMS_UI) $(BITCOIN_QT_CPP) $(
 $(QT_QRC_CPP): $(QT_QRC) $(QT_QM) $(QT_FORMS_H) $(RES_ICONS) $(RES_IMAGES) $(RES_MOVIES) $(PROTOBUF_H)
 	@cd $(abs_srcdir); test -f $(RCC) && QT_SELECT=$(QT_SELECT) $(RCC) -name bitcoin -o $(abs_builddir)/$@ $< || \
 	  echo error: could not build $@
-	$(SED) -e '/^\*\*.*Created:/d' $@ > $@.n && mv $@{.n,}
-	$(SED) -e '/^\*\*.*by:/d' $@  > $@.n && mv $@{.n,}
+	$(SED) -e '/^\*\*.*Created:/d' $@ > $@.n && mv $@.n $@
+	$(SED) -e '/^\*\*.*by:/d' $@  > $@.n && mv $@.n $@
 
 CLEANFILES = $(BUILT_SOURCES) $(QT_QM) $(QT_FORMS_H) *.gcda *.gcno

Line 0 Link Here

(-)net-p2p/zetacoin/files/patch-src_Makefile.include (+27 lines)
	1	--- src/Makefile.include.orig 2014-12-12 22:22:31 UTC
	2	+++ src/Makefile.include
	3	@@ -40,18 +40,18 @@ $(LIBBITCOINQT):
	4	ui_%.h: %.ui
	5	@test -d $(abs_builddir)/$(@D) \|\| $(MKDIR_P) $(abs_builddir)/$(@D)
	6	@test -f $(UIC) && QT_SELECT=$(QT_SELECT) $(UIC) -o $(abs_builddir)/$@ $(abs_srcdir)/$< \|\| echo error: could not build $(abs_builddir)/$@
	7	- $(SED) -e '/^\\.*Created:/d' $(abs_builddir)/$@ > $(abs_builddir)/$@.n && mv $(abs_builddir)/$@{.n,}
	8	- $(SED) -e '/^\\.*by:/d' $(abs_builddir)/$@ > $(abs_builddir)/$@.n && mv $(abs_builddir)/$@{.n,}
	9	+ $(SED) -e '/^\\.*Created:/d' $(abs_builddir)/$@ > $(abs_builddir)/$@.n && mv $(abs_builddir)/$@.n $(abs_builddir)/$@
	10	+ $(SED) -e '/^\\.*by:/d' $(abs_builddir)/$@ > $(abs_builddir)/$@.n && mv $(abs_builddir)/$@.n $(abs_builddir)/$@
	11
	12	%.moc: %.cpp
	13	QT_SELECT=$(QT_SELECT) $(MOC) $(QT_INCLUDES) $(MOC_DEFS) -o $@ $<
	14	- $(SED) -e '/^\\.*Created:/d' $@ > $@.n && mv $@{.n,}
	15	- $(SED) -e '/^\\.*by:/d' $@ > $@.n && mv $@{.n,}
	16	+ $(SED) -e '/^\\.*Created:/d' $@ > $@.n && mv $@.n $(abs_builddir)/$@
	17	+ $(SED) -e '/^\\.*by:/d' $@ > $@.n && mv $@.n $(abs_builddir)/$@
	18
	19	moc_%.cpp: %.h
	20	QT_SELECT=$(QT_SELECT) $(MOC) $(QT_INCLUDES) $(MOC_DEFS) -o $@ $<
	21	- $(SED) -e '/^\\.*Created:/d' $@ > $@.n && mv $@{.n,}
	22	- $(SED) -e '/^\\.*by:/d' $@ > $@.n && mv $@{.n,}
	23	+ $(SED) -e '/^\\.*Created:/d' $@ > $@.n && mv $@.n $(abs_builddir)/$@
	24	+ $(SED) -e '/^\\.*by:/d' $@ > $@.n && mv $@.n $(abs_builddir)/$@
	25
	26	%.qm: %.ts
	27	@test -d $(abs_builddir)/$(@D) \|\| $(MKDIR_P) $(abs_builddir)/$(@D)




--- src/qt/Makefile.am.orig	2014-12-12 22:22:31 UTC
+++ src/qt/Makefile.am
@@ -373,7 +373,7 @@ translate: bitcoinstrings.cpp $(QT_FORMS
 $(QT_QRC_CPP): $(QT_QRC) $(QT_QM) $(QT_FORMS_H) $(RES_ICONS) $(RES_IMAGES) $(RES_MOVIES) $(PROTOBUF_H)
 	@cd $(abs_srcdir); test -f $(RCC) && QT_SELECT=$(QT_SELECT) $(RCC) -name bitcoin -o $(abs_builddir)/$@ $< || \
 	  echo error: could not build $@
-	$(SED) -e '/^\*\*.*Created:/d' $@ > $@.n && mv $@{.n,}
-	$(SED) -e '/^\*\*.*by:/d' $@  > $@.n && mv $@{.n,}
+	$(SED) -e '/^\*\*.*Created:/d' $@ > $@.n && mv $@.n $@
+	$(SED) -e '/^\*\*.*by:/d' $@  > $@.n && mv $@.n $@
 
 CLEANFILES = $(BUILT_SOURCES) $(QT_QM) $(QT_FORMS_H) *.gcda *.gcno

Return to bug 201024

Lines 1-14 Link Here

(-)net-p2p/zetacoin/files/patch-qt_makefile_am_editSedCommands.patch (-14 lines)
1	diff --git a/src/qt/Makefile.am b/src/qt/Makefile.am
2	index 648971b..97b2ec4 100644
3	--- a/src/qt/Makefile.am
4	+++ src/qt/Makefile.am
5	@@ -373,7 +373,7 @@ translate: bitcoinstrings.cpp $(QT_FORMS_UI) $(QT_FORMS_UI) $(BITCOIN_QT_CPP) $(
6	$(QT_QRC_CPP): $(QT_QRC) $(QT_QM) $(QT_FORMS_H) $(RES_ICONS) $(RES_IMAGES) $(RES_MOVIES) $(PROTOBUF_H)
7	@cd $(abs_srcdir); test -f $(RCC) && QT_SELECT=$(QT_SELECT) $(RCC) -name bitcoin -o $(abs_builddir)/$@ $< \|\| \
8	echo error: could not build $@
9	- $(SED) -e '/^\\.*Created:/d' $@ > $@.n && mv $@{.n,}
10	- $(SED) -e '/^\\.*by:/d' $@ > $@.n && mv $@{.n,}
11	+ $(SED) -e '/^\\.*Created:/d' $@ > $@.n && mv $@.n $@
12	+ $(SED) -e '/^\\.*by:/d' $@ > $@.n && mv $@.n $@
13
14	CLEANFILES = $(BUILT_SOURCES) $(QT_QM) $(QT_FORMS_H) .gcda .gcno

Line 0 Link Here

(-)net-p2p/zetacoin/files/patch-src_qt_Makefile.am (+12 lines)
	1	--- src/qt/Makefile.am.orig 2014-12-12 22:22:31 UTC
	2	+++ src/qt/Makefile.am
	3	@@ -373,7 +373,7 @@ translate: bitcoinstrings.cpp $(QT_FORMS
	4	$(QT_QRC_CPP): $(QT_QRC) $(QT_QM) $(QT_FORMS_H) $(RES_ICONS) $(RES_IMAGES) $(RES_MOVIES) $(PROTOBUF_H)
	5	@cd $(abs_srcdir); test -f $(RCC) && QT_SELECT=$(QT_SELECT) $(RCC) -name bitcoin -o $(abs_builddir)/$@ $< \|\| \
	6	echo error: could not build $@
	7	- $(SED) -e '/^\\.*Created:/d' $@ > $@.n && mv $@{.n,}
	8	- $(SED) -e '/^\\.*by:/d' $@ > $@.n && mv $@{.n,}
	9	+ $(SED) -e '/^\\.*Created:/d' $@ > $@.n && mv $@.n $@
	10	+ $(SED) -e '/^\\.*by:/d' $@ > $@.n && mv $@.n $@
	11
	12	CLEANFILES = $(BUILT_SOURCES) $(QT_QM) $(QT_FORMS_H) .gcda .gcno