Skip to content

Submit/gtk and more#996

Closed
MarcWeber wants to merge 3 commits intoNixOS:masterfrom
MarcWeber:submit/gtk-and-more
Closed

Submit/gtk and more#996
MarcWeber wants to merge 3 commits intoNixOS:masterfrom
MarcWeber:submit/gtk-and-more

Conversation

@MarcWeber
Copy link
Contributor

  1. probably helpful: "gnome-autogen.sh: make check_m4macros aware of ACLOCAL_PATH"
  2. adding dispcalgui
  3. mypaint 3 versions. You may or may not like it. Adding it to this pull request because its the use case for 1)

I suggest merging 1) and 2) and evaluating 3) if you're interested only.

These changes were already found in #517

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm just curious -- any reason for adding fetchurl_gnome?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

obviously not.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, sorry, you weren't adding it, and it's used. I was confused by my diff which used the prefix from fetchurl_gnome for fetchurl :-)

@vcunat
Copy link
Member

vcunat commented Oct 26, 2013

(1) is certainly fine.
(2) well, we have a policy trying to have a released version as the default, but I see just a svn version here. Or is it a release?

@domenkozar
Copy link
Member

@MarcWeber 1) is already merged. What's up with 2) ?

@MarcWeber
Copy link
Contributor Author

I don't use it myself at the moment - I have it in my branch anyway - closing it for now

@MarcWeber MarcWeber closed this Feb 20, 2014
klemensn added a commit to klemensn/nixpkgs that referenced this pull request Jun 3, 2022
This release is still subject to double-free crashes in at least the
signature verification functionality, but debugging that requires an up
to date version (released two months ago), so here we go.

NB: Upstream released two source tarballs without further information,
qdigidoc4_r.2.11.110.orig.tar.xz contains sources without subdirectory,
qdigidoc4_r.2.11.110-1804.tar.xz contains a subdirectory with sources;
their difference is irrelevant for our build, so pick the one 1804 one:
```
$ diff -u -r qdigidoc4_r.2.11.110.orig/ qdigidoc4_r.2.11.110-1804/qdigidoc4/
Only in qdigidoc4_r.2.11.110.orig/cmake: .git
Only in qdigidoc4_r.2.11.110.orig/common: .git
Only in qdigidoc4_r.2.11.110.orig/common: .gitmodules
diff '--color=auto' -u -r qdigidoc4_r.2.11.110.orig/debian/changelog qdigidoc4_r.2.11.110-1804/qdigidoc4/debian/changelog
--- qdigidoc4_r.2.11.110.orig/debian/changelog	2022-01-28 13:44:35.000000000 +0200
+++ qdigidoc4_r.2.11.110-1804/qdigidoc4/debian/changelog	2022-01-28 13:44:38.000000000 +0200
@@ -1,3 +1,9 @@
+qdigidoc4 (4.2.11.110-1804) unstable; urgency=medium
+
+  * Release: 4.2.11.110.
+
+ -- RIA <info@ria.ee>  Fri, 28 Jan 2022 13:44:38 +0200
+
 qdigidoc4 (0.2.0.3) stable; urgency=low

   * Initial release
Only in qdigidoc4_r.2.11.110.orig/extensions/cmake: .git
Only in qdigidoc4_r.2.11.110.orig/extensions: .git
Only in qdigidoc4_r.2.11.110.orig/extensions: .gitmodules
```

```
$ git log --oneline v4.2.9..v4.2.11
2631e24 (tag: v4.2.11) Update translation (NixOS#1025)
76c671a Support Fedora (NixOS#997)
639cebe Update Qt to 5.12.2 (NixOS#1019)
cde7fb8 Add web-eid to diagnostics (NixOS#989)
faa8276 Add default option to sign button (NixOS#1001)
cb8262a Update OpenLDAP 2.6.0 (NixOS#996)
132de43 Workaround for Yaru theme on ubuntu 21.10 (NixOS#994)
58e4278 Improve safeFilename (NixOS#986)
1710f47 Fix coverity and cppcheck warnings (NixOS#992)
60af0bb Remove autofocus (NixOS#981)
5a9ff0a Use thread monitor event state (NixOS#845)
cdd95a5 Fix LDAP certificate validation (NixOS#980)
92f81ec Workaround SID/MID proxy unicode issues (NixOS#982)
92a5aaa Update version number and OpenSSL, OpenLDAP versions (NixOS#977)
5971e54 Update Xalan-C 1.12 (NixOS#976)
1f848cf Add more specific info for OpenSSLExceptions (NixOS#970)
0497b7f Set Select folder dialog button label and fix some translation warnings (NixOS#974)
e56e814 Workaround recent Qt changes to pass mousePressEvent (NixOS#978)
44f4a7e Update translations in russian for settings (NixOS#973)
25756eb Wait for upper level operations to avoid locked screen (NixOS#979)
232784e Don't set focus to fonds image (NixOS#967)
5cf2157 Change the view of expired and expiring certificates (NixOS#965)
b001274 Resolve a yellow background, when PIN is locked (NixOS#971)
4b20375 Fix the boolean value (NixOS#975)
1a41817 Resolve Ubuntu 21.04 warnings (NixOS#946)
301178b Set read-only permission for files in signed container (NixOS#962)
e028a30 Update OpenLDAP 2.5.5 (NixOS#963)
1fb5f6a Set accessible name to pin (NixOS#966)
18e6112 Handle libdigidocpp exception (NixOS#943)
a9efe0f Update translations (NixOS#961)
06e44a0 Fix Linux dark theme (NixOS#950)
a6ff428 Fix missed border of Accordion (NixOS#960)
a14476c Update list of components in Info view (NixOS#958)
8980270 Fix normalization of filenames (NixOS#952)
e4aac44 Shorten notifications display time (NixOS#948)
14606dc Use QSysInfo for OS version (NixOS#931)
b8716e7 Resolve a yellow background, when PIN is locked (NixOS#947)
0319c6b Don't allow searching for spaces during encryption (NixOS#929)
```
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants