openSUSE Build Service

Overview Repositories Revisions Requests Users Attributes Meta

File sax-alc.diff of Package sax2

Index: api/macros/getUSBTabletPort
===================================================================
--- api/macros/getUSBTabletPort.orig
+++ api/macros/getUSBTabletPort
@@ -21,6 +21,20 @@ if (-l "$file/device/driver") {
 	my $link = readlink ("$file/device/driver");
 	foreach my $validDriver (@tabletDrivers) {
 		if ($link =~ /$validDriver/) {
+			if (-d "/dev/input/by-id") {
+				my $evfile = $file;
+				$evfile =~ s/.*\/(.*)/$1/;
+				foreach my $pname (</dev/input/by-id/*>) {
+					if (-l $pname) {
+						my $plink = readlink ($pname);
+						$plink =~ s/.*\/(.*)/$1/;
+						if ($plink eq $evfile) {
+							print $pname;
+							exit (0);
+						}
+					}
+				}
+			}
 			my $eventNr = chop ($file);
 			print "/dev/input/event$eventNr\n";
 			exit (0);
Index: api/tablet/tabletconnection.cpp
===================================================================
--- api/tablet/tabletconnection.cpp.orig
+++ api/tablet/tabletconnection.cpp
@@ -165,7 +165,7 @@ void SCCTabletConnection::setMode ( cons
 // setPort
 //------------------------------------
 void SCCTabletConnection::setPort ( const QString& device ) {
-	QRegExp identifier ("/dev/input/event");
+	QRegExp identifier ("/dev/input/");
 	if (identifier.search (device) >= 0) {
 		mPortBox -> setCurrentItem ( 0 );
 	}
@@ -327,7 +327,7 @@ void SCCTabletConnection::slotTablet (
 		if (device == "AUTO") {
 			mPortGroup -> setDisabled ( true );
 		}
-		QRegExp identifier ("/dev/input/event");
+		QRegExp identifier ("/dev/input/");
 		if (identifier.search (device) >= 0) {
 			mPortBox -> setCurrentItem ( 0 );
 		}
Index: modules/ImportAPI.pm
===================================================================
--- modules/ImportAPI.pm.orig
+++ modules/ImportAPI.pm
@@ -1185,7 +1185,7 @@ sub ApiImportLayout {
 			my $inputf = $api{Mouse}{"$count InputFashion"};
 			if (
 				(! defined $entity{$driver}{$device}) ||
-				($device =~ /ttyS/) || ($device =~ /\/dev\/input\/event/)
+				($device =~ /ttyS/) || ($device =~ /\/dev\/input\//)
 			) {
 				my $l = "ServerLayout";
 				$var{$l}{all}{InputDevice}{$count}{id}    = $list[$i];

Places

File sax-alc.diff of Package sax2

Places