-
Notifications
You must be signed in to change notification settings - Fork 35
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.
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
Py3 qt5 el8 #64
Open
helge000
wants to merge
5
commits into
tb2097:master
Choose a base branch
from
helge000:py3-qt5-el8
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Py3 qt5 el8 #64
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,20 @@ | ||
root = true | ||
|
||
[*] | ||
end_of_line = lf | ||
insert_final_newline = true | ||
charset = utf-8 | ||
|
||
[*.py] | ||
indent_style = space | ||
indent_size = 4 | ||
|
||
[*.ui] | ||
indent_style = space | ||
indent_size = 2 | ||
|
||
[*.json] | ||
indent_style = tab | ||
indent_size = 4 | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,2 @@ | ||
__pycache__/ | ||
.pyc |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,32 +1,31 @@ | ||
%global libwacom_ver 1.11 | ||
%global libwacom_ver 2.2.0 | ||
|
||
Name: wacom-gui | ||
Version: 0.3.1 | ||
Release: rc1 | ||
Summary: Wacom PyQt4 GUI | ||
Version: 0.4.0 | ||
Release: rc2 | ||
Summary: Wacom PyQt5 GUI | ||
License: GPLv3 | ||
BuildArch: noarch | ||
URL: https://github.com/tb2097/wacom-gui | ||
Requires: PyQt4 | ||
Requires: PyQt4-webkit | ||
Requires: qtwebkit | ||
Requires: PyQt5 | ||
Requires: libwacom | ||
Requires: xorg-x11-server-utils | ||
Requires: xorg-x11-drv-wacom | ||
Requires: xorg-x11-xkb-utils | ||
Requires: xorg-x11-utils | ||
Requires: dconf | ||
Requires: usbutils | ||
Requires: python | ||
Requires: python3 | ||
Requires: systemd | ||
BuildRequires: python | ||
Source0: %{name}-%{version}-%{release}.tar.xz | ||
BuildRequires: python3 | ||
Source0: %{name}-%{version}-%{release}.tar.gz | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I am not sure whatever you want a |
||
# latest libwacom source can be downloaded from https://github.com/linuxwacom/libwacom/releases/latest | ||
# this is just to get the .tablet and svg data | ||
Source1: libwacom-%{libwacom_ver}.tar.bz2 | ||
Source1: libwacom-%{libwacom_ver}.tar.xz | ||
Source2: wacom.desktop | ||
|
||
%description | ||
Wacom PyQt4 GUI | ||
Wacom PyQt5 GUI | ||
|
||
%prep | ||
%setup -q -n %{name}-%{version}-%{release} | ||
|
@@ -36,7 +35,7 @@ Wacom PyQt4 GUI | |
cd wacom-gui | ||
rm -f *.pyc | ||
rm -f *.ui | ||
python -m compileall . | ||
python3 -m compileall . | ||
mv ../LICENSE . | ||
mv ../README.md . | ||
mkdir data | ||
|
@@ -47,7 +46,7 @@ rm -f data/layouts/Makefile.* | |
|
||
%install | ||
%__rm -rf %{buildroot} | ||
cd wacom-gui | ||
cd wacom-gui/wacom-gui | ||
install -m 0755 -d %{buildroot}/usr/local/%{name} | ||
cp -r * %{buildroot}/usr/local/%{name} | ||
cd ../rpmbuild | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
#!/usr/bin/env python | ||
#!/usr/bin/env python3 | ||
# -*- coding: utf-8 -*- | ||
# SPDX-FileCopyrightText: Copyright © 2021 Jason Gerecke <[email protected]> | ||
# SPDX-License-Identifier: MIT | ||
|
@@ -181,7 +181,7 @@ def _kde5ConfigPath(): | |
def _kdeConfigPath(version=None): | ||
""" | ||
Return a configuration path for an arbitrary KDE version. | ||
|
||
This function tries to be clever about detecting the most likely | ||
path intended. You can request a specific version by providing it | ||
as an argument. This function will raise an exception if no version | ||
|
@@ -232,11 +232,11 @@ def _dumpKhotkeysRc(): | |
class _KdeConfigParser(configparser.RawConfigParser): | ||
""" | ||
Custom configuration parser designed for KDE files. | ||
|
||
This parser extends the RawConfigParser with necessary default options | ||
and some convenience functions. | ||
""" | ||
|
||
def __init__(self): | ||
configparser.RawConfigParser.__init__(self, allow_no_value = True) | ||
self.optionxform = str | ||
|
@@ -272,7 +272,7 @@ def write(self, fileobj): | |
def _addShortcutSection(data, parent, value): | ||
""" | ||
Create a new "Data_{N}" section for a khotkeys shortcut. | ||
|
||
This function takes a dictionary of values and assigns them to a | ||
new "Data_{N}" section of the khotkeys configuration. This function | ||
takes care of updating the number of declared data sections and | ||
|
@@ -315,7 +315,7 @@ def _addShortcutSection(data, parent, value): | |
def _addShortcutSubsection(data, ident, subsection, value): | ||
""" | ||
Create a new "Data_{N}{Foo}" subsection for a khotkeys shortcut. | ||
|
||
This function takes a dictionary of values and assigns them to a | ||
new "Data_{N}{Foo}" section of the khotkeys configuration. This | ||
function takes care of updating the number of declared {Foo} | ||
|
@@ -352,7 +352,7 @@ def _addShortcutSubsection(data, ident, subsection, value): | |
def _addShortcut(data, parent, name, command, shortcut, comment): | ||
""" | ||
Add a new shortcut into the khotkeys configuration. | ||
|
||
This function creates the multiple sections of khotkeys configuration | ||
which define a keyboard shortcut that launches a command. No validation | ||
is performed to check for other conflicting shortcuts; you should | ||
|
@@ -393,7 +393,7 @@ def _addShortcut(data, parent, name, command, shortcut, comment): | |
def getShortcutData(data, ident): | ||
""" | ||
Try to return basic information about the requested khotkeys shortcut. | ||
|
||
Looks for the provided identifier in the khotkeys configuration and | ||
returns information about the shortcut, if possible. If the identifier | ||
could not be found or it does not correspond to a simple command-launching | ||
|
@@ -418,7 +418,7 @@ def getShortcutData(data, ident): | |
actions_name = "{}Actions".format(section_name) | ||
triggers_name = "{}Triggers".format(section_name) | ||
conditions_name = "{}Conditions".format(section_name) | ||
|
||
if section_name not in data: | ||
return None | ||
section_data = data[section_name] | ||
|
@@ -451,7 +451,7 @@ def getShortcutData(data, ident): | |
def _findShortcut(data, name = None, shortcut = None, uuid = None): | ||
""" | ||
Search the provided khotkeys dict for a matching shortcut. | ||
|
||
This function searches through the khotkeys configuration for any | ||
shortcut which matches all of the provided paramters. Any parameter | ||
may be ignored by providing 'None' as its value. | ||
|
@@ -503,7 +503,7 @@ def _findShortcut(data, name = None, shortcut = None, uuid = None): | |
def _createShortcut(name, command, shortcut, comment=''): | ||
""" | ||
Create a new shortcut in the khotkeys configuration. | ||
|
||
This function will attempt to add a new shortcut into the khotkeys | ||
file. It will check to ensure the shortcut does not already exist | ||
first (no other shortcut may share its name or keyboard sequence). | ||
|
@@ -538,15 +538,15 @@ def _createShortcut(name, command, shortcut, comment=''): | |
|
||
uuid = _addShortcut(data, '', name, command, shortcut, comment) | ||
parser.read_dict(data) | ||
|
||
with open(config_path + ".tmp", 'w') as output: | ||
parser.write(output) | ||
return uuid | ||
|
||
def _createGlobal(shortcut_uuid, name, shortcut): | ||
""" | ||
Create a new hotkey shortcut in the kglobalshortcutsrc config file. | ||
|
||
This function will attempt to add a new khotkeys shortcut into the | ||
kglobalshortcutsrc file. It does not perform any checking if the | ||
shortcut is already in use. | ||
|
@@ -572,7 +572,7 @@ def _createGlobal(shortcut_uuid, name, shortcut): | |
def create(name, command, shortcut, comment): | ||
""" | ||
Create a new shortcut in the necessary KDE config files. | ||
|
||
This function will attempt to add a new shortcut into the two config | ||
files that control custom user shortcuts. | ||
|
||
|
@@ -603,7 +603,7 @@ def create(name, command, shortcut, comment): | |
def activate(): | ||
""" | ||
Cause changes to the shortcut configuration files to become active. | ||
|
||
This function will replace the live config files with the temporary | ||
versions constructed by other functions and cause KDE to re-read its | ||
configuration files. | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
On EL8 I currently get a
libwacom-1.6-3.el8.x86_64
- don't know whatever the version is important here?