view src/nettle-1-fixes.patch @ 4472:0fdeee4cfe11

gnuplot: enable Qt terminal and set default to wxt * src/gnuplot.mk: Depend on qt5 and build with QT=1 QT_DIR=$(HOST_PREFIX)/qt QT_BIN_DIR=(BUILD_TOOLS_PREFIX)/bin, install gnuplot_qt.exe * src/gnuplot-1-fixes.patch: add to patchto allow override of QT tools and paths * installer-files/octave-firsttime.vbs: set GNUTERM=wxt * installer-files/octave.vbs: set GNUTERM=wxt * installer-files/octave.bat: set GNUTERM=wxt * installer-files/cmdshell.bat: set GNUTERM=wxt
author Mike Miller <mtmiller@octave.org>
date Wed, 06 Sep 2017 16:19:37 -0700
parents 0a747a64a790
children
line wrap: on
line source

This file is part of MXE. See LICENSE.md for licensing information.

From c5836bef883966beb9b5be562ef0a6d0c6048879 Mon Sep 17 00:00:00 2001
From: Mark Brand <mabrand@mabrand.nl>
Date: Sun, 12 Apr 2015 10:07:58 +0200
Subject: [PATCH] Revert "Include private dependencies automatically in
 pkg-config for non-shared builds"

This reverts commit c8b1d2fafff16c57ec50d413c999796ec2085413.

diff --git a/hogweed.pc.in b/hogweed.pc.in
index 97fb9d4..839f7d0 100644
--- a/hogweed.pc.in
+++ b/hogweed.pc.in
@@ -11,9 +11,8 @@ Name: Hogweed
 Description: Nettle low-level cryptographic library (public-key algorithms)
 URL: http://www.lysator.liu.se/~nisse/nettle
 Version: @PACKAGE_VERSION@
-Requires: @IF_NOT_SHARED@ nettle
-Requires.private: @IF_SHARED@ nettle
-Libs: -L${libdir} -lhogweed @IF_NOT_SHARED@ @LIBS@
-Libs.private: @IF_SHARED@ @LIBS@
+Requires.private: nettle
+Libs: -L${libdir} -lhogweed
+Libs.private: @LIBS@
 Cflags: -I${includedir}
 
-- 
2.5.0