Skip to content

Commit

Permalink
Update copyright.txt and compare_license.py
Browse files Browse the repository at this point in the history
  • Loading branch information
rolandlo committed Jul 28, 2023
1 parent 257b559 commit db73f05
Show file tree
Hide file tree
Showing 2 changed files with 38 additions and 13 deletions.
30 changes: 19 additions & 11 deletions copyright.txt
Original file line number Diff line number Diff line change
Expand Up @@ -24,17 +24,17 @@ License: GPL-2+
Comment: Source of truth https://github.com/xournalpp/xournalpp/graphs/contributors
For a full and detailed list of contributors refer to the git log.

Files: src/control/xojfile/LoadHandlerHelper.cpp
src/control/xojfile/LoadHandlerHelper.h
src/gui/widgets/ZoomCallib.cpp
src/gui/widgets/ZoomCallib.h
Files: src/core/control/xojfile/LoadHandlerHelper.cpp
src/core/control/xojfile/LoadHandlerHelper.h
src/core/gui/widgets/ZoomCallib.cpp
src/core/gui/widgets/ZoomCallib.h
Copyright: 2015, Xournal Team
License: GPL-2+
Comment: The files were committed by Andreas Butti initially who was active for both
Xournal and Xournal++

Files: src/gui/widgets/gtkmenutooltogglebutton.cpp
src/gui/widgets/gtkmenutooltogglebutton.h
Files: src/core/gui/widgets/gtkmenutooltogglebutton.cpp
src/core/gui/widgets/gtkmenutooltogglebutton.h
Copyright: 2004, Paolo Borelli
2003, Ricardo Fernandez Pascual
License: LGPL-2+
Expand Down Expand Up @@ -135,11 +135,19 @@ Files: plugins/MigrateFontSizes/plugin.ini
Copyright: 2021, Roland Lötscher
License: GPL-2+

Files: plugins/Export/plugin.ini
Copyright: 2021, Roland Lötscher
License: GPL-2+

Files: plugins/ColorCycle/plugin.ini
plugins/LayerActions/plugin.ini
Copyright: 2020, Roland Lötscher
License: GPL-2+

Files: plugins/HighlightPosition/plugin.ini
Copyright: 2021, Michael J. Gruber
License: GPL-2+

Files: plugins/Example/plugin.ini
plugins/ToggleGrid/plugin.ini
Copyright: 2019, Andreas Butti
Expand All @@ -149,13 +157,13 @@ Files: plugins/QuickScreenshot/plugin.ini
Copyright: 2020, Debbie Reynolds
License: GPL-2+

Files: src/gui/GladeSearchpath.h
src/gui/GladeSearchpath.cpp
Files: src/core/gui/GladeSearchpath.h
src/core/gui/GladeSearchpath.cpp
Copyright: 2011, Andreas Butti
License: GPL-2+

Files: src/gui/dialog/LatexDialog.h
src/gui/dialog/LatexDialog.cpp
Files: src/core/gui/dialog/LatexDialog.h
src/core/gui/dialog/LatexDialog.cpp
Copyright: 2013, Wilson Brenna
License: GPL-2+

Expand All @@ -168,7 +176,7 @@ Comment: Original Author Paolo Bacchilega <paolo.bacch@tin.it>
seemingly for the FSF but this is unclear from the code
License: GPL-3+

Files: src/util/safe_casts.h
Files: src/util/include/util/safe_casts.h
Copyright: 2020, Fabian Keßler <fabian_kessler@gmx.de>
License: BSL-1

Expand Down
21 changes: 19 additions & 2 deletions scripts/compare_license.py
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,9 @@ def get_whitelist_not_listed():
white_list.add("rpm/fedora/xournalpp.spec") # false positive
white_list.add("windows-setup/xournalpp.nsi") # false positive
white_list.add("ui/about.glade") # false positive
white_list.add("src/win32/xpp.rc.in") # false positive
white_list.add("src/exe/win32/xpp.rc.in") # false positive
white_list.add("mac-setup/Info.plist") # false positive
white_list.add("src/core/gui/dialog/AboutDialog.cpp") # false positive
return white_list

# II: Add an entry to the whitelist if you added a file which has special
Expand Down Expand Up @@ -135,11 +137,26 @@ def get_whitelist_not_found():
white_list.add("ui/pixmaps/xopt.svg")
white_list.add("ui/iconsColor-dark/*")
white_list.add("ui/iconsColor-light/*")
white_list.add("ui/iconsLucide-dark/*")
white_list.add("ui/iconsLucide-light/*")
white_list.add("ui/iconsColor-dark/hicolor/scalable/actions/xopp-compass.svg")
white_list.add("ui/iconsColor-dark/hicolor/scalable/actions/xopp-setsquare.svg")
white_list.add("ui/iconsColor-light/hicolor/scalable/actions/xopp-Tselect-pdf-text-area.svg")
white_list.add("ui/iconsColor-light/hicolor/scalable/actions/xopp-Tselect-pdf-text-hd.svg")
white_list.add("ui/iconsLucide-dark/hicolor/scalable/actions/xopp-compass.svg")
white_list.add("ui/iconsLucide-dark/hicolor/scalable/actions/xopp-draw-spline.svg")
white_list.add("ui/iconsLucide-dark/hicolor/scalable/actions/xopp-floating-toolbox.svg")
white_list.add("ui/iconsLucide-dark/hicolor/scalable/actions/xopp-setsquare.svg")
white_list.add("ui/iconsLucide-light/hicolor/scalable/actions/xopp-compass.svg")
white_list.add("ui/iconsLucide-light/hicolor/scalable/actions/xopp-draw-spline.svg")
white_list.add("ui/iconsLucide-light/hicolor/scalable/actions/xopp-floating-toolbox.svg")
white_list.add("ui/iconsLucide-light/hicolor/scalable/actions/xopp-setsquare.svg")

return white_list

# III: Update git commit hash to current commit once you checked
# that the changes do not affect the licensing information in copyright.txt
last_checked_git_commit_hash = "89eee20c3dab1d1bfc18d125f32d510b6862168d"
last_checked_git_commit_hash = "44499921e90d2d3620f9f23395be3b44a226f617"

changed_files = get_changed_files_since(last_checked_git_commit_hash)

Expand Down

0 comments on commit db73f05

Please sign in to comment.