Djam/kdebase4-workspace
1
0
Fork 0
mirror of https://abf.rosa.ru/djam/kdebase4-workspace.git synced 2025-02-23 17:52:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

LOG New version 4.9.4, update fontconfig patch

Browse source
This commit is contained in:
Andrey Bondrov 2012-12-05 22:42:19 +00:00
parent 315e98a4e2
commit bad687edc6
3 changed files with 36 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
.abf.yml
View file

@ -1,4 +1,4 @@
sources:
"kdebase-workspace-kdm-2.7.tar.bz2": 1bc07c270b60eb5c41ecbffa7026a5b90b2a2b0a
"kdebase-workspace-plasma-applet-systemtray-1.2.tar.gz": d6a5229c84e8ec95ed72f88f7937900135d09f58
kde-workspace-4.9.4-pre.tar.xz: ecfd225b151a7f3fa9d339e16cbe605237904ca8
kdebase-workspace-kdm-2.7.tar.bz2: 1bc07c270b60eb5c41ecbffa7026a5b90b2a2b0a
kdebase-workspace-plasma-applet-systemtray-1.2.tar.gz: d6a5229c84e8ec95ed72f88f7937900135d09f58
kde-workspace-4.9.4.tar.xz: c619181256f86bb1921cfbe6136ea3604d94aabe

48
kde-workspace-4.9.3-fontconfig.patch → kde-workspace-4.9.4-fontconfig.patch
View file

@ -1,18 +1,22 @@
diff -urN kde-workspace-4.9.3/kcontrol/fonts/fonts.cpp kde-workspace-4.9.3-patched/kcontrol/fonts/fonts.cpp
--- kde-workspace-4.9.3/kcontrol/fonts/fonts.cpp 2012-08-13 19:52:57.000000000 +1100
+++ kde-workspace-4.9.3-patched/kcontrol/fonts/fonts.cpp 2012-11-29 02:57:06.000000000 +1100
@@ -278,6 +278,10 @@
Файл kde-workspace-4.9.4/build/testsock это сокет, тогда как файл kde-workspace-4.9.4-patched/build/testsock -- сокет
diff -urN kde-workspace-4.9.4/kcontrol/fonts/fonts.cpp kde-workspace-4.9.4-patched/kcontrol/fonts/fonts.cpp
--- kde-workspace-4.9.4/kcontrol/fonts/fonts.cpp 2012-12-02 23:48:15.000000000 +0000
+++ kde-workspace-4.9.4-patched/kcontrol/fonts/fonts.cpp 2012-12-05 20:12:06.581348560 +0000
@@ -278,6 +278,13 @@
QString hintingText(i18n("Hinting is a process used to enhance the quality of fonts at small sizes."));
hintingStyle->setWhatsThis( hintingText);
hintingLabel->setWhatsThis( hintingText);
+
+ useBCI=new QCheckBox(i18n("Use bytecode interpreter"), mw);
+ layout->addRow(useBCI);
+
+ QString bciWhatsThis(i18n("A method of hinting that often improves the appearance of TrueType fonts."));
+ useBCI->setWhatsThis( bciWhatsThis );
+
load();
enableWidgets();
setMainWidget(mw);
@@ -288,6 +292,7 @@
@@ -288,6 +295,7 @@
connect(excludeTo, SIGNAL(valueChanged(double)), SLOT(changed()));
connect(subPixelType, SIGNAL(activated(QString)), SLOT(changed()));
connect(hintingStyle, SIGNAL(activated(QString)), SLOT(changed()));
@ -20,7 +24,7 @@ diff -urN kde-workspace-4.9.3/kcontrol/fonts/fonts.cpp kde-workspace-4.9.3-patch
}
bool FontAASettings::load()
@@ -340,6 +345,8 @@
@@ -340,6 +348,8 @@
hintingStyle->setCurrentIndex(getIndex(hStyle));
@ -29,7 +33,7 @@ diff -urN kde-workspace-4.9.3/kcontrol/fonts/fonts.cpp kde-workspace-4.9.3-patch
enableWidgets();
return xft.getAntiAliasing();
@@ -378,6 +385,9 @@
@@ -378,6 +388,9 @@
grp.writeEntry("XftHintStyle", hs);
mod=true;
}
@ -39,7 +43,7 @@ diff -urN kde-workspace-4.9.3/kcontrol/fonts/fonts.cpp kde-workspace-4.9.3-patch
kglobals.sync();
if(!mod)
@@ -395,6 +405,7 @@
@@ -395,6 +408,7 @@
excludeTo->setValue(15.0);
useSubPixel->setChecked(false);
hintingStyle->setCurrentIndex(getIndex(KXftConfig::Hint::Medium));
@ -47,9 +51,9 @@ diff -urN kde-workspace-4.9.3/kcontrol/fonts/fonts.cpp kde-workspace-4.9.3-patch
enableWidgets();
}
diff -urN kde-workspace-4.9.3/kcontrol/fonts/fonts.h kde-workspace-4.9.3-patched/kcontrol/fonts/fonts.h
--- kde-workspace-4.9.3/kcontrol/fonts/fonts.h 2012-08-13 19:52:57.000000000 +1100
+++ kde-workspace-4.9.3-patched/kcontrol/fonts/fonts.h 2012-11-29 02:57:06.000000000 +1100
diff -urN kde-workspace-4.9.4/kcontrol/fonts/fonts.h kde-workspace-4.9.4-patched/kcontrol/fonts/fonts.h
--- kde-workspace-4.9.4/kcontrol/fonts/fonts.h 2012-12-02 23:48:15.000000000 +0000
+++ kde-workspace-4.9.4-patched/kcontrol/fonts/fonts.h 2012-12-05 20:01:43.790758887 +0000
@@ -78,6 +78,7 @@
QCheckBox *excludeRange;
@ -58,10 +62,10 @@ diff -urN kde-workspace-4.9.3/kcontrol/fonts/fonts.h kde-workspace-4.9.3-patched
KDoubleNumInput *excludeFrom;
KDoubleNumInput *excludeTo;
QComboBox *subPixelType;
diff -urN kde-workspace-4.9.3/kcontrol/fonts/kxftconfig.cpp kde-workspace-4.9.3-patched/kcontrol/fonts/kxftconfig.cpp
--- kde-workspace-4.9.3/kcontrol/fonts/kxftconfig.cpp 2012-08-13 19:52:57.000000000 +1100
+++ kde-workspace-4.9.3-patched/kcontrol/fonts/kxftconfig.cpp 2012-11-29 03:03:11.000000000 +1100
@@ -233,6 +240,7 @@
diff -urN kde-workspace-4.9.4/kcontrol/fonts/kxftconfig.cpp kde-workspace-4.9.4-patched/kcontrol/fonts/kxftconfig.cpp
--- kde-workspace-4.9.4/kcontrol/fonts/kxftconfig.cpp 2012-12-02 23:48:15.000000000 +0000
+++ kde-workspace-4.9.4-patched/kcontrol/fonts/kxftconfig.cpp 2012-12-05 20:01:43.791258888 +0000
@@ -246,6 +246,7 @@
m_excludeRange.reset();
m_excludePixelRange.reset();
m_subPixel.reset();
@ -69,7 +73,7 @@ diff -urN kde-workspace-4.9.3/kcontrol/fonts/kxftconfig.cpp kde-workspace-4.9.3-
QFile f(m_file);
@@ -300,6 +308,7 @@
@@ -313,6 +314,7 @@
newConfig.setSubPixelType(m_subPixel.type);
newConfig.setHintStyle(m_hint.style);
newConfig.setAntiAliasing(m_antiAliasing.set);
@ -77,7 +81,7 @@ diff -urN kde-workspace-4.9.3/kcontrol/fonts/kxftconfig.cpp kde-workspace-4.9.3-
ok=newConfig.changed() ? newConfig.apply() : true;
if(ok)
@@ -327,6 +336,7 @@
@@ -340,6 +342,7 @@
applySubPixelType();
applyHintStyle();
applyAntiAliasing();
@ -85,7 +89,7 @@ diff -urN kde-workspace-4.9.3/kcontrol/fonts/kxftconfig.cpp kde-workspace-4.9.3-
applyExcludeRange(false);
applyExcludeRange(true);
@@ -564,6 +574,12 @@
@@ -577,6 +580,12 @@
m_antiAliasing.node=n;
m_antiAliasing.set=str.toLower()!="false";
}
@ -98,7 +102,7 @@ diff -urN kde-workspace-4.9.3/kcontrol/fonts/kxftconfig.cpp kde-workspace-4.9.3-
}
}
break;
@@ -811,6 +827,41 @@
@@ -824,6 +833,41 @@
m_antiAliasing.node=matchNode;
}
@ -140,9 +144,9 @@ diff -urN kde-workspace-4.9.3/kcontrol/fonts/kxftconfig.cpp kde-workspace-4.9.3-
// KXftConfig only parses one config file, user's .fonts.conf usually.
// If that one doesn't exist, then KXftConfig doesn't know if antialiasing
// is enabled or not. So try to find out the default value from the default font.
diff -urN kde-workspace-4.9.3/kcontrol/fonts/kxftconfig.h kde-workspace-4.9.3-patched/kcontrol/fonts/kxftconfig.h
--- kde-workspace-4.9.3/kcontrol/fonts/kxftconfig.h 2012-08-13 19:52:57.000000000 +1100
+++ kde-workspace-4.9.3-patched/kcontrol/fonts/kxftconfig.h 2012-11-29 03:03:32.000000000 +1100
diff -urN kde-workspace-4.9.4/kcontrol/fonts/kxftconfig.h kde-workspace-4.9.4-patched/kcontrol/fonts/kxftconfig.h
--- kde-workspace-4.9.4/kcontrol/fonts/kxftconfig.h 2012-12-02 23:48:15.000000000 +0000
+++ kde-workspace-4.9.4-patched/kcontrol/fonts/kxftconfig.h 2012-12-05 20:01:43.791258888 +0000
@@ -116,6 +116,16 @@
bool set;
};

10
kdebase4-workspace.spec
View file

@ -11,12 +11,12 @@
Name: kdebase4-workspace
Summary: KDE 4 application workspace components
Version: 4.9.4
Release: 0.1
Release: 1
Epoch: 2
Group: Graphical desktop/KDE
License: GPL
URL: http://www.kde.org
Source: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kde-workspace-%{version}-pre.tar.xz
Source: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kde-workspace-%{version}.tar.xz
Source1: kde.pam
Source2: kde-np.pam
Source3: mandriva-startkde
@ -28,7 +28,7 @@ Source10: %{name}.rpmlintrc
Patch0: kdebase-workspace-4.5.76-mdv-adopt-ldetect-path.patch
Patch2: kdebase-workspace-4.9.3-menu-toptile.patch
# Add checkbox to enable/disable bytecode interpreter in KDE4 font anti-aliasing settings
Patch3: kde-workspace-4.9.3-fontconfig.patch
Patch3: kde-workspace-4.9.4-fontconfig.patch
Patch11: kdebase-workspace-4.2.0-fix_gtkrc_iaora.patch
Patch13: kdebase-workspace-4.8.95-startup-sound.patch
Patch19: kdebase-workspace-4.2.1-use-mdvicon.patch
@ -1605,6 +1605,10 @@ for f in %{buildroot}%{_kde_applicationsdir}/*.desktop ; do
done
%changelog
* Wed Dec 05 2012 Andrey Bondrov <andrey.bondrov@rosalab.ru> 2:4.9.4-1
- New version 4.9.4
- Update fontconfig patch
* Thu Nov 29 2012 Ural Mullabaev <ural.mullabaev@rosalab.ru> 4.9.3-7
- Increased avatars size limits