Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 71e24364c977
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: eed06a0da90b
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Dec 29, 2020

  1. qt514.qtwebkit: Fix patch applying

    @SuperSandro2000
    SuperSandro2000 committed Dec 29, 2020
    Copy the full SHA
    d05ff6e View commit details

Commits on Jan 2, 2021

  1. Merge pull request #107898 from SuperSandro2000/qtwebkit-darwin 

    qt514.qtwebkit: Fix patch applying
    @ttuegel
    ttuegel authored Jan 2, 2021
    Copy the full SHA
    eed06a0 View commit details
Showing with 0 additions and 15 deletions.
  1. +0 −15 pkgs/development/libraries/qt-5/5.14/qtwebkit-darwin-no-readline.patch
15 changes: 0 additions & 15 deletions pkgs/development/libraries/qt-5/5.14/qtwebkit-darwin-no-readline.patch
View file
Original file line number Diff line number Diff line change
@@ -28,18 +28,3 @@ diff --git a/Source/WTF/wtf/Platform.h b/Source/WTF/wtf/Platform.h
#define HAVE_SYS_TIMEB_H 1

#if !PLATFORM(GTK) && !PLATFORM(QT)
diff --git a/Source/WTF/wtf/PlatformMac.cmake b/Source/WTF/wtf/PlatformMac.cmake
--- a/Source/WTF/wtf/PlatformMac.cmake
+++ b/Source/WTF/wtf/PlatformMac.cmake
@@ -2,11 +2,9 @@ set(WTF_LIBRARY_TYPE SHARED)

find_library(COCOA_LIBRARY Cocoa)
find_library(COREFOUNDATION_LIBRARY CoreFoundation)
-find_library(READLINE_LIBRARY Readline)
list(APPEND WTF_LIBRARIES
${COREFOUNDATION_LIBRARY}
${COCOA_LIBRARY}
- ${READLINE_LIBRARY}
libicucore.dylib
)