[meego-packaging] [meego-commits] 17112: Changes to devel:qt-mtf/meegotouchcp-datetime
Marko Saukko
marko.saukko at gmail.com
Thu Apr 28 09:04:14 PDT 2011
Hi,
DO NOT change the tarball name if the upstream doesn't change. tarball
should always be straight from the upstream with the upstream version.
Now when I look this also the previous change from .1 to .10 was
wrong. The version of this should still be 0.7.5.1 and just patches
added to OBS packaging. OBS will increase the package version
automatically when submits are done for the same package version,
i.e., 0.7.5.1-1.1 with first submission to specific version
0.7.5.1-2.1 with second submission to the same version etc. Last
number is how many times the package has been recompiled without any
source changes.
Regards,
Marko
On Thu, Apr 28, 2011 at 6:54 PM, Gabor Juhasz <no_reply at build.meego.com> wrote:
> Hi,
> I have made the following changes to meegotouchcp-datetime in project devel:qt-mtf. Please review and accept ASAP.
>
> Thank You,
> Gabor Juhasz
>
> [This message was auto-generated]
>
> ---
>
> Request #17112:
>
> submit: home:gabor:branches:devel:qt-mtf/meegotouchcp-datetime(r3)(cleanup) -> devel:qt-mtf/meegotouchcp-datetime
>
>
> Message:
> * Thu Apr 28 2011 Gabor Juhasz <ext-gabor.2.juhasz at nokia.com> - 0.7.50.13
> - 3 patches for meegotouchcp-datetime : BMC#16835
> - BMC#15676 Top Bar Time format for clock doesn't work on boot
> - BMC#16535 Year, month and day fields have no manual input option for Date settings
> - BMC#16777 Removing automatic timeupdate UI control
>
> State: new 2011-04-28T08:54:10 gabor
> Comment: None
>
>
>
> changes files:
> --------------
> --- meegotouchcp-datetime.changes
> +++ meegotouchcp-datetime.changes
> @@ -0,0 +1,6 @@
> +* Thu Apr 28 2011 Gabor Juhasz <ext-gabor.2.juhasz at nokia.com> - 0.7.50.13
> +- 3 patches for meegotouchcp-datetime : BMC#16835
> +- BMC#15676 Top Bar Time format for clock doesn't work on boot
> +- BMC#16535 Year, month and day fields have no manual input option for Date settings
> +- BMC#16777 Removing automatic timeupdate UI control
> +
>
> old:
> ----
> meegotouchcp-datetime-0.7.50.10.tar.bz2
>
> new:
> ----
> 6_BMC_15676_Top-Bar-Time-format-for-clock-does-not-work-on-boot.patch
> 7_BMC_16535_Year-month-and-day-fields-have-no-manual-input-option-for-Date-settings.patch
> 8_BMC_16777_Removing-automatic-timeupdate-UI-control.patch
> meegotouchcp-datetime-0.7.50.13.tar.bz2
>
> spec files:
> -----------
> --- meegotouchcp-datetime.spec
> +++ meegotouchcp-datetime.spec
> @@ -7,7 +7,7 @@
>
> Name: meegotouchcp-datetime
> Summary: MeeGo Language Settings
> -Version: 0.7.50.10
> +Version: 0.7.50.13
> Release: 1
> Group: Application Framework/MeeGo Touch Settings
> License: LGPLv2.1
> @@ -19,6 +19,9 @@
> Patch2: 3_BMC_14301_Don-not-require-cellular-net-if-not-using-cellular-qt.patch
> Patch3: 4_BMC_15899_Datetime-can-not-be-compiled-with-new-qmsystem.patch
> Patch4: 5_BMC_15677_No-difference-between-analog-and-digital-clock.patch
> +Patch5: 6_BMC_15676_Top-Bar-Time-format-for-clock-does-not-work-on-boot.patch
> +Patch6: 7_BMC_16535_Year-month-and-day-fields-have-no-manual-input-option-for-Date-settings.patch
> +Patch7: 8_BMC_16777_Removing-automatic-timeupdate-UI-control.patch
> Requires: meegotouchcp-datetime-l10n-engineering-english = %{version}
> BuildRequires: pkgconfig(QtGui)
> BuildRequires: pkgconfig(icu-uc)
> @@ -64,6 +67,12 @@
> %patch3 -p1
> # 5_BMC_15677_No-difference-between-analog-and-digital-clock.patch
> %patch4 -p1
> +# 6_BMC_15676_Top-Bar-Time-format-for-clock-does-not-work-on-boot.patch
> +%patch5 -p1
> +# 7_BMC_16535_Year-month-and-day-fields-have-no-manual-input-option-for-Date-settings.patch
> +%patch6 -p1
> +# 8_BMC_16777_Removing-automatic-timeupdate-UI-control.patch
> +%patch7 -p1
> # >> setup
> # << setup
>
>
> other changes:
> --------------
>
> ++++++ 6_BMC_15676_Top-Bar-Time-format-for-clock-does-not-work-on-boot.patch (new)
> --- 6_BMC_15676_Top-Bar-Time-format-for-clock-does-not-work-on-boot.patch
> +++ 6_BMC_15676_Top-Bar-Time-format-for-clock-does-not-work-on-boot.patch
> +diff --git a/dcpapplet/src/mainview.cpp b/dcpapplet/src/mainview.cpp
> +index 8222784..15a82e8 100644
> +--- a/dcpapplet/src/mainview.cpp
> ++++ b/dcpapplet/src/mainview.cpp
> +@@ -344,7 +344,7 @@ void MainView::datetimeSettingsChangedSlot()
> + void MainView::timeFormatCBoxActivatedSlot(int idx)
> + {
> + qDebug() << Q_FUNC_INFO;
> +- // m_Locale->connectSettings();
> ++ m_Locale->connectSettings();
> + Settings::instance().setTimeFormat(
> + (idx == TimeFormatCBoxIndex12h) ? TimeFormat12h : TimeFormat24h);
> + if (m_Locale)
>
> ++++++ 7_BMC_16535_Year-month-and-day-fields-have-no-manual-input-option-for-Date-settings.patch (new)
> --- 7_BMC_16535_Year-month-and-day-fields-have-no-manual-input-option-for-Date-settings.patch
> +++ 7_BMC_16535_Year-month-and-day-fields-have-no-manual-input-option-for-Date-settings.patch
> +diff --git a/dcpapplet/src/datepicker-fake.cpp b/dcpapplet/src/datepicker-fake.cpp
> +index fe202da..c5526d1 100644
> +--- a/dcpapplet/src/datepicker-fake.cpp
> ++++ b/dcpapplet/src/datepicker-fake.cpp
> +@@ -296,24 +296,18 @@ DatePicker::construct(const MCalendar& cal)
> + connect (m_Calendar, SIGNAL (clicked (QDate)),
> + this, SLOT (onClicked (QDate)));
> +
> +- // this hack disables opening of the month and year buttons:
> +- QWidget* monthButton =
> +- m_Calendar->findChild<QWidget*>("qt_calendar_monthbutton");
> +- QWidget* yearButton =
> +- m_Calendar->findChild<QWidget*>("qt_calendar_yearbutton");
> +- monthButton->setEnabled (false);
> +- yearButton->setEnabled (false);
> +-
> + setWidget (m_Calendar);
> +-
> ++
> + QSize minSize(470,380);
> +
> + m_Calendar->setMinimumSize (minSize);
> + m_Calendar->setSizePolicy (QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding);
> + setMinimumSize (minSize);
> + setSizePolicy (QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding);
> ++ m_Calendar->setStyleSheet("QToolButton::menu-arrow {minimum-size: 5px 5px;}");
> + }
> +
> ++
> + DatePicker::~DatePicker()
> + {
> + }
>
> ++++++ 8_BMC_16777_Removing-automatic-timeupdate-UI-control.patch (new)
> --- 8_BMC_16777_Removing-automatic-timeupdate-UI-control.patch
> +++ 8_BMC_16777_Removing-automatic-timeupdate-UI-control.patch
> +diff --git a/dcpapplet/src/mainview.cpp b/dcpapplet/src/mainview.cpp
> +index 15a82e8..fe47223 100644
> +--- a/dcpapplet/src/mainview.cpp
> ++++ b/dcpapplet/src/mainview.cpp
> +@@ -85,17 +85,18 @@ void MainView::initWidget()
> + spacer1->setStyleName("CommonSmallSpacer");
> + mainLayoutPolicy->addItem(spacer1);
> +
> ++#ifndef MEEGO
> + /* m_AutoSyncButton */
> + m_AutoSyncButton = new AutoSyncButton();
> + m_AutoSyncButton->setObjectName("m_AutoSyncButton");
> + m_AutoSyncButton->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Minimum);
> +
> + mainLayoutPolicy->addItem(m_AutoSyncButton);
> +-
> + MStylableWidget* sep1 = new MStylableWidget();
> + sep1->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Minimum);
> + sep1->setStyleName("CommonHeaderDividerInverted");
> + mainLayoutPolicy->addItem(sep1);
> ++#endif
> +
> + /* m_TimeButton */
> + m_TimeButton = new DrillListItem();
> +@@ -164,7 +165,7 @@ void MainView::finishMainView()
> +
> + // init values and dimming state
> + datetimeSettingsChangedSlot();
> +-
> ++ timeFormatCBoxActivatedSlot(m_Locale->timeFormat24h() == MLocale::TwelveHourTimeFormat24h ? 0:1);
> + m_IsViewCreated = true;
> + }
> +
> +@@ -335,10 +336,12 @@ void MainView::datetimeSettingsChangedSlot()
> + datetimeChangedSlot();
> + updateTimeZoneText();
> + updateTimeFormatText();
> ++#ifndef MEEGO
> + bool autoSyncEnabled = Settings::instance().getAutoSync();
> + m_TimeButton->setDisabled(autoSyncEnabled);
> + m_DateButton->setDisabled(autoSyncEnabled);
> + m_TimeZoneButton->setDisabled(autoSyncEnabled);
> ++#endif
> + }
> +
> + void MainView::timeFormatCBoxActivatedSlot(int idx)
>
> ++++++ meegotouchcp-datetime-0.7.50.10.tar.bz2 -> meegotouchcp-datetime-0.7.50.13.tar.bz2
>
> ++++++ meegotouchcp-datetime.yaml
> --- meegotouchcp-datetime.yaml
> +++ meegotouchcp-datetime.yaml
> @@ -1,6 +1,6 @@
> Name: meegotouchcp-datetime
> Summary: MeeGo Language Settings
> -Version: 0.7.50.10
> +Version: 0.7.50.13
> Release: 1
> Group: Application Framework/MeeGo Touch Settings
> License: LGPLv2.1
> @@ -13,6 +13,9 @@
> - 3_BMC_14301_Don-not-require-cellular-net-if-not-using-cellular-qt.patch
> - 4_BMC_15899_Datetime-can-not-be-compiled-with-new-qmsystem.patch
> - 5_BMC_15677_No-difference-between-analog-and-digital-clock.patch
> + - 6_BMC_15676_Top-Bar-Time-format-for-clock-does-not-work-on-boot.patch
> + - 7_BMC_16535_Year-month-and-day-fields-have-no-manual-input-option-for-Date-settings.patch
> + - 8_BMC_16777_Removing-automatic-timeupdate-UI-control.patch
> Description: MeegoTouchControlPanel plugin to set date and time.
> PkgConfigBR:
> - QtGui
>
> _______________________________________________
> MeeGo-commits mailing list
> MeeGo-commits at meego.com
> http://lists.meego.com/listinfo/meego-commits
>
More information about the MeeGo-packaging
mailing list