Attachment 157950 Details for Bug 201024 – Patch.diff

[patch] Patch.diff

patch-zetacoin.diff (text/plain), 7.04 KB, created by Andriy Voskoboinyk on 2015-06-21 19:29:12 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Andriy Voskoboinyk

Created: 2015-06-21 19:29:12 UTC

Size: 7.04 KB

patch

obsolete

>Index: net-p2p/zetacoin/Makefile
>===================================================================
>--- net-p2p/zetacoin/Makefile	(revision 390261)
>+++ net-p2p/zetacoin/Makefile	(working copy)
>@@ -34,7 +34,8 @@
> X11_CONFIGURE_ON=	--without-daemon
> X11_CONFIGURE_OFF=	--with-daemon
> X11_BUILD_DEPENDS=	protoc:${PORTSDIR}/devel/protobuf
>-X11_USE=	qt4=corelib,gui,qmake_build,linguist,uic,moc,rcc,qtestlib_build
>+X11_USE=	qt4=corelib,network,gui,qmake_build,linguisttools_build \
>+		qt4=uic_build,moc_build,rcc_build,qtestlib_build
> X11_USES=	desktop-file-utils
> 
> WALLET_CONFIGURE_ENABLE=	wallet
>Index: net-p2p/zetacoin/files/patch-Makefile_include_editSedCommands.patch
>===================================================================
>--- net-p2p/zetacoin/files/patch-Makefile_include_editSedCommands.patch	(revision 390261)
>+++ net-p2p/zetacoin/files/patch-Makefile_include_editSedCommands.patch	(working copy)
>@@ -1,29 +0,0 @@
>-diff --git a/src/Makefile.include b/src/Makefile.include
>-index 2fc6cd7..cdd16f5 100644
>---- a/src/Makefile.include
>-+++ src/Makefile.include
>-@@ -40,18 +40,18 @@ $(LIBBITCOINQT):
>- ui_%.h: %.ui
>- 	@test -d $(abs_builddir)/$(@D) || $(MKDIR_P) $(abs_builddir)/$(@D)
>- 	@test -f $(UIC) && QT_SELECT=$(QT_SELECT) $(UIC) -o $(abs_builddir)/$@ $(abs_srcdir)/$< || echo error: could not build $(abs_builddir)/$@
>--	$(SED) -e '/^\*\*.*Created:/d' $(abs_builddir)/$@ > $(abs_builddir)/$@.n && mv $(abs_builddir)/$@{.n,}
>--	$(SED) -e '/^\*\*.*by:/d' $(abs_builddir)/$@ > $(abs_builddir)/$@.n && mv $(abs_builddir)/$@{.n,}
>-+	$(SED) -e '/^\*\*.*Created:/d' $(abs_builddir)/$@ > $(abs_builddir)/$@.n && mv $(abs_builddir)/$@.n $(abs_builddir)/$@
>-+	$(SED) -e '/^\*\*.*by:/d' $(abs_builddir)/$@ > $(abs_builddir)/$@.n && mv $(abs_builddir)/$@.n $(abs_builddir)/$@
>- 
>- %.moc: %.cpp
>- 	QT_SELECT=$(QT_SELECT) $(MOC) $(QT_INCLUDES) $(MOC_DEFS) -o $@ $<
>--	$(SED) -e '/^\*\*.*Created:/d' $@ > $@.n && mv $@{.n,}
>--	$(SED) -e '/^\*\*.*by:/d' $@ > $@.n && mv $@{.n,}
>-+	$(SED) -e '/^\*\*.*Created:/d' $@ > $@.n && mv $@.n $(abs_builddir)/$@
>-+	$(SED) -e '/^\*\*.*by:/d' $@ > $@.n && mv $@.n $(abs_builddir)/$@
>- 
>- moc_%.cpp: %.h
>- 	QT_SELECT=$(QT_SELECT) $(MOC) $(QT_INCLUDES) $(MOC_DEFS) -o $@ $<
>--	$(SED) -e '/^\*\*.*Created:/d' $@ > $@.n && mv $@{.n,}
>--	$(SED) -e '/^\*\*.*by:/d' $@ > $@.n && mv $@{.n,}
>-+	$(SED) -e '/^\*\*.*Created:/d' $@ > $@.n && mv $@.n $(abs_builddir)/$@
>-+	$(SED) -e '/^\*\*.*by:/d' $@ > $@.n && mv $@.n $(abs_builddir)/$@
>- 
>- %.qm: %.ts
>- 	@test -d $(abs_builddir)/$(@D) || $(MKDIR_P) $(abs_builddir)/$(@D)
>Index: net-p2p/zetacoin/files/patch-qt_makefile_am_editSedCommands.patch
>===================================================================
>--- net-p2p/zetacoin/files/patch-qt_makefile_am_editSedCommands.patch	(revision 390261)
>+++ net-p2p/zetacoin/files/patch-qt_makefile_am_editSedCommands.patch	(working copy)
>@@ -1,14 +0,0 @@
>-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
>Index: net-p2p/zetacoin/files/patch-src_Makefile.include
>===================================================================
>--- net-p2p/zetacoin/files/patch-src_Makefile.include	(revision 0)
>+++ net-p2p/zetacoin/files/patch-src_Makefile.include	(working copy)
>@@ -0,0 +1,27 @@
>+--- src/Makefile.include.orig	2014-12-12 22:22:31 UTC
>++++ src/Makefile.include
>+@@ -40,18 +40,18 @@ $(LIBBITCOINQT):
>+ ui_%.h: %.ui
>+ 	@test -d $(abs_builddir)/$(@D) || $(MKDIR_P) $(abs_builddir)/$(@D)
>+ 	@test -f $(UIC) && QT_SELECT=$(QT_SELECT) $(UIC) -o $(abs_builddir)/$@ $(abs_srcdir)/$< || echo error: could not build $(abs_builddir)/$@
>+-	$(SED) -e '/^\*\*.*Created:/d' $(abs_builddir)/$@ > $(abs_builddir)/$@.n && mv $(abs_builddir)/$@{.n,}
>+-	$(SED) -e '/^\*\*.*by:/d' $(abs_builddir)/$@ > $(abs_builddir)/$@.n && mv $(abs_builddir)/$@{.n,}
>++	$(SED) -e '/^\*\*.*Created:/d' $(abs_builddir)/$@ > $(abs_builddir)/$@.n && mv $(abs_builddir)/$@.n $(abs_builddir)/$@
>++	$(SED) -e '/^\*\*.*by:/d' $(abs_builddir)/$@ > $(abs_builddir)/$@.n && mv $(abs_builddir)/$@.n $(abs_builddir)/$@
>+ 
>+ %.moc: %.cpp
>+ 	QT_SELECT=$(QT_SELECT) $(MOC) $(QT_INCLUDES) $(MOC_DEFS) -o $@ $<
>+-	$(SED) -e '/^\*\*.*Created:/d' $@ > $@.n && mv $@{.n,}
>+-	$(SED) -e '/^\*\*.*by:/d' $@ > $@.n && mv $@{.n,}
>++	$(SED) -e '/^\*\*.*Created:/d' $@ > $@.n && mv $@.n $(abs_builddir)/$@
>++	$(SED) -e '/^\*\*.*by:/d' $@ > $@.n && mv $@.n $(abs_builddir)/$@
>+ 
>+ moc_%.cpp: %.h
>+ 	QT_SELECT=$(QT_SELECT) $(MOC) $(QT_INCLUDES) $(MOC_DEFS) -o $@ $<
>+-	$(SED) -e '/^\*\*.*Created:/d' $@ > $@.n && mv $@{.n,}
>+-	$(SED) -e '/^\*\*.*by:/d' $@ > $@.n && mv $@{.n,}
>++	$(SED) -e '/^\*\*.*Created:/d' $@ > $@.n && mv $@.n $(abs_builddir)/$@
>++	$(SED) -e '/^\*\*.*by:/d' $@ > $@.n && mv $@.n $(abs_builddir)/$@
>+ 
>+ %.qm: %.ts
>+ 	@test -d $(abs_builddir)/$(@D) || $(MKDIR_P) $(abs_builddir)/$(@D)
>
>Property changes on: net-p2p/zetacoin/files/patch-src_Makefile.include
>___________________________________________________________________
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Index: net-p2p/zetacoin/files/patch-src_qt_Makefile.am
>===================================================================
>--- net-p2p/zetacoin/files/patch-src_qt_Makefile.am	(revision 0)
>+++ net-p2p/zetacoin/files/patch-src_qt_Makefile.am	(working copy)
>@@ -0,0 +1,12 @@
>+--- 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
>
>Property changes on: net-p2p/zetacoin/files/patch-src_qt_Makefile.am
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property

Actions: View | Diff

Attachments on bug 201024: 157950 | 157951 | 157952