forked from pool/doxygen
Accepting request 452172 from devel:tools
(forwarded request 452170 from StefanBruens) OBS-URL: https://build.opensuse.org/request/show/452172 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/doxygen?expand=0&rev=67
This commit is contained in:
commit
cd2bb5379b
@ -1,7 +1,7 @@
|
|||||||
#
|
#
|
||||||
# spec file for package doxygen-doc
|
# spec file for package doxygen-doc
|
||||||
#
|
#
|
||||||
# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
|
# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
|
||||||
#
|
#
|
||||||
# All modifications and additions to the file contributed by third parties
|
# All modifications and additions to the file contributed by third parties
|
||||||
# remain the property of their copyright owners, unless otherwise agreed
|
# remain the property of their copyright owners, unless otherwise agreed
|
||||||
|
@ -1,3 +1,9 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Tue Jan 24 12:28:25 UTC 2017 - stefan.bruens@rwth-aachen.de
|
||||||
|
|
||||||
|
- Added res2cc_sort_resources.diff, sort template files in
|
||||||
|
generated resources.cpp for reproducible build, fixes bgo#777672
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Wed Nov 30 11:32:31 UTC 2016 - pgajdos@suse.com
|
Wed Nov 30 11:32:31 UTC 2016 - pgajdos@suse.com
|
||||||
|
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
#
|
#
|
||||||
# spec file for package doxygen
|
# spec file for package doxygen
|
||||||
#
|
#
|
||||||
# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
|
# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
|
||||||
#
|
#
|
||||||
# All modifications and additions to the file contributed by third parties
|
# All modifications and additions to the file contributed by third parties
|
||||||
# remain the property of their copyright owners, unless otherwise agreed
|
# remain the property of their copyright owners, unless otherwise agreed
|
||||||
@ -34,6 +34,8 @@ Patch3: vhdlparser-no-return.patch
|
|||||||
Patch4: doxygen-dot-one-thread.patch
|
Patch4: doxygen-dot-one-thread.patch
|
||||||
# is upstreamed, bnc#1011331
|
# is upstreamed, bnc#1011331
|
||||||
Patch5: doxygen-fix-QCH-files.patch
|
Patch5: doxygen-fix-QCH-files.patch
|
||||||
|
# Submitted upstream, fix for https://bugzilla.gnome.org/show_bug.cgi?id=777672
|
||||||
|
Patch6: res2cc_sort_resources.diff
|
||||||
BuildRequires: bison
|
BuildRequires: bison
|
||||||
BuildRequires: cmake >= 2.8.12
|
BuildRequires: cmake >= 2.8.12
|
||||||
BuildRequires: flex
|
BuildRequires: flex
|
||||||
@ -59,6 +61,7 @@ as well.
|
|||||||
%patch4 -p1
|
%patch4 -p1
|
||||||
%endif
|
%endif
|
||||||
%patch5 -p1
|
%patch5 -p1
|
||||||
|
%patch6 -p0
|
||||||
|
|
||||||
%build
|
%build
|
||||||
export CFLAGS="%{optflags} -fPIC"
|
export CFLAGS="%{optflags} -fPIC"
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
#
|
#
|
||||||
# spec file for package doxywizard
|
# spec file for package doxywizard
|
||||||
#
|
#
|
||||||
# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
|
# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
|
||||||
#
|
#
|
||||||
# All modifications and additions to the file contributed by third parties
|
# All modifications and additions to the file contributed by third parties
|
||||||
# remain the property of their copyright owners, unless otherwise agreed
|
# remain the property of their copyright owners, unless otherwise agreed
|
||||||
|
15
res2cc_sort_resources.diff
Normal file
15
res2cc_sort_resources.diff
Normal file
@ -0,0 +1,15 @@
|
|||||||
|
--- src/res2cc_cmd.py_orig 2016-05-10 21:51:52.000000000 +0200
|
||||||
|
+++ src/res2cc_cmd.py 2017-01-23 23:54:53.499507342 +0100
|
||||||
|
@@ -98,10 +98,11 @@
|
||||||
|
directory = sys.argv[1]
|
||||||
|
files = []
|
||||||
|
for dirName, subdirList, fileList in walk(directory):
|
||||||
|
- for fname in sorted(fileList):
|
||||||
|
+ for fname in fileList:
|
||||||
|
subdir = dirName[len(directory)+1:] if dirName.startswith(directory) else dirName
|
||||||
|
if subdir:
|
||||||
|
files.append(File.factory(directory,subdir,fname))
|
||||||
|
+ files.sort(key=lambda f: f.subdir + "/" + f.fileName)
|
||||||
|
outputFile = open(sys.argv[2],"w")
|
||||||
|
print("#include \"resourcemgr.h\"\n",file=outputFile)
|
||||||
|
for f in files:
|
Loading…
Reference in New Issue
Block a user