Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

KDE Applications: 16.12.2 -> 16.12.3 #23992

Merged
merged 1 commit into from Mar 17, 2017
Merged

KDE Applications: 16.12.2 -> 16.12.3 #23992

merged 1 commit into from Mar 17, 2017

Conversation

ttuegel
Copy link
Member

@ttuegel ttuegel commented Mar 17, 2017

Motivation for this change

Routine package updates.

Things done

  • Tested using sandboxing
    (nix.useSandbox on NixOS,
    or option build-use-sandbox in nix.conf
    on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • Linux
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Fits CONTRIBUTING.md.

I will need to backport this to release-17.03.

@ttuegel ttuegel self-assigned this Mar 17, 2017
@mention-bot
Copy link

@ttuegel, thanks for your PR! By analyzing the history of the files in this pull request, we identified @FRidh and @phunehehe to be potential reviewers.

@ttuegel ttuegel merged commit 73ccc49 into NixOS:master Mar 17, 2017
@ttuegel ttuegel deleted the kde-applications-16.12.3 branch March 17, 2017 20:40
@FRidh
Copy link
Member

FRidh commented Mar 18, 2017

I think this broke kdelibs.

building path(s) ‘/nix/store/5pkd4b09fi5kxcp9nlglc1hr83ylahy8-kdelibs-4.14.30’, ‘/nix/store/v4ihf07as0a7kfmqmb95bav7ckqja0wd-kdelibs-4.14.30-dev’
unpacking sources
unpacking source archive /nix/store/75rf52ng7xkc67b3l0pga72xaf57zm9r-kdelibs-4.14.30.tar.xz
source root is kdelibs-4.14.30
setting SOURCE_DATE_EPOCH to timestamp 1488622505 of file kdelibs-4.14.30/threadweaver/threadweaver_export.h
patching sources
applying patch /nix/store/gyasjanjvadplk0qjzik2690fsv3mwyp-0001-old-kde4-cmake-policies.patch
patching file cmake/modules/FindKDE4Internal.cmake
applying patch /nix/store/cbr4r0rk2ncabrn2hynv3gnfz5c1bz8v-0002-polkit-install-path.patch
patching file kdecore/auth/ConfigureChecks.cmake
applying patch /nix/store/d7kw150x6s05qy6iraiscaz35h45xrin-0003-remove_xdg_impurities.patch
patching file kdecore/kernel/kstandarddirs.cpp
patching file solid/solid/xdgbasedirs.cpp
applying patch /nix/store/vjd6m2bz34b0q6wf095whhqyiircvyim-SanitizeURLsBeforePassingThemToFindProxyForURL.patch
patching file kio/misc/kpac/script.cpp
Reversed (or previously applied) patch detected!  Assume -R? [n] 
Apply anyway? [n] 
Skipping patch.
1 out of 1 hunk ignored -- saving rejects to file kio/misc/kpac/script.cpp.rej
builder for ‘/nix/store/abh5kg86avs0prg1ndyshm37rhxk6yh1-kdelibs-4.14.30.drv’ failed with exit code 1

@FRidh
Copy link
Member

FRidh commented Mar 18, 2017

Fixed with 2478f7b.

FRidh added a commit that referenced this pull request Mar 18, 2017
@FRidh
kdelibs: remove sanitize patch
2478f7b 
because its included in 4.14.30 which was part of Applications 16.12.3.
#23992 (comment)
vcunat pushed a commit that referenced this pull request Mar 19, 2017
@FRidh @vcunat
kdelibs: remove sanitize patch
d685191 
because its included in 4.14.30 which was part of Applications 16.12.3.
#23992 (comment)

(cherry picked from commit 2478f7b)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@ttuegel ttuegel

Labels
6.topic: qt/kde 8.has: package (update)
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@ttuegel @mention-bot @FRidh