Update Pipelight: both Wine version and Pipelight distribution

This commit is contained in:
Michael Raskin
2014-11-02 23:36:36 +03:00
parent 815bbfb852
commit 4ef5bd9918
2 changed files with 5 additions and 32 deletions

View File

@@ -66,33 +66,6 @@ diff -urN pipelight.old/configure pipelight.new/configure
moz_plugin_path=""
gcc_runtime_dlls=""
so_mode="0644"
diff -urN pipelight.old/Makefile pipelight.new/Makefile
--- pipelight.old/Makefile 2014-07-19 22:53:02.000000000 +0200
+++ pipelight.new/Makefile 2014-07-26 23:25:22.020707765 +0200
@@ -29,7 +29,7 @@
-e 's|@@BINDIR@@|$(bindir)|g' \
-e 's|@@DATADIR@@|$(datadir)|g' \
-e 's|@@GCC_RUNTIME_DLLS@@|$(gcc_runtime_dlls)|g' \
- -e 's|@@GPG@@|$(gpgexec)|g' \
+ -e 's|@@GPG@@|$(gpg_exec)|g' \
-e 's|@@LIBDIR@@|$(libdir)|g' \
-e 's|@@MANDIR@@|$(mandir)|g' \
-e 's|@@MOZ_PLUGIN_PATH@@|$(moz_plugin_path)|g' \
@@ -69,12 +69,12 @@
.PHONY: prebuilt32
prebuilt32: config.make pluginloader-$(git_commit).tar.gz pluginloader-$(git_commit).tar.gz.sig
- $(gpgexec) --batch --no-default-keyring --keyring "share/sig-pluginloader.gpg" --verify "pluginloader-$(git_commit).tar.gz.sig"
+ $(gpg_exec) --batch --no-default-keyring --keyring "share/sig-pluginloader.gpg" --verify "pluginloader-$(git_commit).tar.gz.sig"
tar -xvf "pluginloader-$(git_commit).tar.gz" src/windows/pluginloader.exe src/winecheck/winecheck.exe
.PHONY: prebuilt64
prebuilt64: config.make pluginloader-$(git_commit).tar.gz pluginloader-$(git_commit).tar.gz.sig
- $(gpgexec) --batch --no-default-keyring --keyring "share/sig-pluginloader.gpg" --verify "pluginloader-$(git_commit).tar.gz.sig"
+ $(gpg_exec) --batch --no-default-keyring --keyring "share/sig-pluginloader.gpg" --verify "pluginloader-$(git_commit).tar.gz.sig"
tar -xvf "pluginloader-$(git_commit).tar.gz" src/windows/pluginloader64.exe src/winecheck/winecheck64.exe
.PHONY: pluginloader32
diff -urN pipelight.old/share/install-dependency pipelight.new/share/install-dependency
--- pipelight.old/share/install-dependency 2014-07-19 22:53:02.000000000 +0200
+++ pipelight.new/share/install-dependency 2014-07-26 23:26:18.431938546 +0200